134 lines
4.1 KiB
Diff
134 lines
4.1 KiB
Diff
From 92e9fb334c38cd21652ce8adde9ec01ab4412426 Mon Sep 17 00:00:00 2001
|
|
From: Jinhua Cao <caojinhua1@hauwei.com>
|
|
Date: Tue, 15 Feb 2022 15:18:17 +0800
|
|
Subject: [PATCH] Revert "qmp: add command to query used memslots of vhost-net
|
|
and vhost-user"
|
|
|
|
This reverts commit 1545a60a8b78490c7dc8909b7012bca63dba63cd.
|
|
|
|
Signed-off-by: Jinhua Cao <caojinhua1@huawei.com>
|
|
---
|
|
hw/virtio/vhost-backend.c | 2 +-
|
|
hw/virtio/vhost-user.c | 2 +-
|
|
include/hw/virtio/vhost-backend.h | 2 --
|
|
monitor/qmp-cmds.c | 12 ------------
|
|
qapi/net.json | 18 ------------------
|
|
qapi/pragma.json | 4 +---
|
|
6 files changed, 3 insertions(+), 37 deletions(-)
|
|
|
|
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
|
|
index d8e1710758..2acfb750fd 100644
|
|
--- a/hw/virtio/vhost-backend.c
|
|
+++ b/hw/virtio/vhost-backend.c
|
|
@@ -300,7 +300,7 @@ static void vhost_kernel_set_used_memslots(struct vhost_dev *dev)
|
|
vhost_kernel_used_memslots = dev->mem->nregions;
|
|
}
|
|
|
|
-unsigned int vhost_kernel_get_used_memslots(void)
|
|
+static unsigned int vhost_kernel_get_used_memslots(void)
|
|
{
|
|
return vhost_kernel_used_memslots;
|
|
}
|
|
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
|
|
index 8f69a3b850..176cae9244 100644
|
|
--- a/hw/virtio/vhost-user.c
|
|
+++ b/hw/virtio/vhost-user.c
|
|
@@ -2544,7 +2544,7 @@ static void vhost_user_set_used_memslots(struct vhost_dev *dev)
|
|
vhost_user_used_memslots = counter;
|
|
}
|
|
|
|
-unsigned int vhost_user_get_used_memslots(void)
|
|
+static unsigned int vhost_user_get_used_memslots(void)
|
|
{
|
|
return vhost_user_used_memslots;
|
|
}
|
|
diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
|
|
index 7bbc658161..a64708f456 100644
|
|
--- a/include/hw/virtio/vhost-backend.h
|
|
+++ b/include/hw/virtio/vhost-backend.h
|
|
@@ -190,6 +190,4 @@ int vhost_backend_handle_iotlb_msg(struct vhost_dev *dev,
|
|
|
|
int vhost_user_gpu_set_socket(struct vhost_dev *dev, int fd);
|
|
|
|
-unsigned int vhost_kernel_get_used_memslots(void);
|
|
-unsigned int vhost_user_get_used_memslots(void);
|
|
#endif /* VHOST_BACKEND_H */
|
|
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
|
|
index a138e7dd4b..d71beace6a 100644
|
|
--- a/monitor/qmp-cmds.c
|
|
+++ b/monitor/qmp-cmds.c
|
|
@@ -37,7 +37,6 @@
|
|
#include "qapi/qapi-commands-machine.h"
|
|
#include "qapi/qapi-commands-misc.h"
|
|
#include "qapi/qapi-commands-ui.h"
|
|
-#include "qapi/qapi-commands-net.h"
|
|
#include "qapi/type-helpers.h"
|
|
#include "qapi/qmp/qerror.h"
|
|
#include "exec/ramlist.h"
|
|
@@ -45,7 +44,6 @@
|
|
#include "hw/acpi/acpi_dev_interface.h"
|
|
#include "hw/intc/intc.h"
|
|
#include "hw/rdma/rdma.h"
|
|
-#include "hw/virtio/vhost-backend.h"
|
|
|
|
NameInfo *qmp_query_name(Error **errp)
|
|
{
|
|
@@ -476,13 +474,3 @@ int64_t qmp_query_rtc_date_diff(Error **errp)
|
|
{
|
|
return get_rtc_date_diff();
|
|
}
|
|
-
|
|
-uint32_t qmp_query_vhost_kernel_used_memslots(Error **errp)
|
|
-{
|
|
- return vhost_kernel_get_used_memslots();
|
|
-}
|
|
-
|
|
-uint32_t qmp_query_vhost_user_used_memslots(Error **errp)
|
|
-{
|
|
- return vhost_user_get_used_memslots();
|
|
-}
|
|
diff --git a/qapi/net.json b/qapi/net.json
|
|
index c9ff849eed..7fab2e7cd8 100644
|
|
--- a/qapi/net.json
|
|
+++ b/qapi/net.json
|
|
@@ -696,21 +696,3 @@
|
|
##
|
|
{ 'event': 'FAILOVER_NEGOTIATED',
|
|
'data': {'device-id': 'str'} }
|
|
-
|
|
-##
|
|
-# @query-vhost-kernel-used-memslots:
|
|
-#
|
|
-# Get vhost-kernel nic used memslots
|
|
-#
|
|
-# Since: 4.1
|
|
-##
|
|
-{ 'command': 'query-vhost-kernel-used-memslots', 'returns': 'uint32' }
|
|
-
|
|
-##
|
|
-# @query-vhost-user-used-memslots:
|
|
-#
|
|
-# Get vhost-user nic used memslots
|
|
-#
|
|
-# Since: 4.1
|
|
-##
|
|
-{ 'command': 'query-vhost-user-used-memslots', 'returns': 'uint32' }
|
|
diff --git a/qapi/pragma.json b/qapi/pragma.json
|
|
index d35c897acb..b37f6de445 100644
|
|
--- a/qapi/pragma.json
|
|
+++ b/qapi/pragma.json
|
|
@@ -27,9 +27,7 @@
|
|
'query-tpm-models',
|
|
'query-tpm-types',
|
|
'ringbuf-read',
|
|
- 'query-rtc-date-diff',
|
|
- 'query-vhost-user-used-memslots',
|
|
- 'query-vhost-kernel-used-memslots' ],
|
|
+ 'query-rtc-date-diff' ],
|
|
# Externally visible types whose member names may use uppercase
|
|
'member-name-exceptions': [ # visible in:
|
|
'ACPISlotType', # query-acpi-ospm-status
|
|
--
|
|
2.27.0
|
|
|