[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] qmp: introduce query-memory-size-summary command
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 6/7] qmp: introduce query-memory-size-summary command |
Date: |
Thu, 14 Sep 2017 16:04:46 +0100 |
From: Vadim Galitsyn <address@hidden>
Add a new query-memory-size-summary command which provides the
following memory information in bytes:
* base-memory - size of "base" memory specified with command line option -m.
* plugged-memory - amount of memory that was hot-plugged.
If target does not have CONFIG_MEM_HOTPLUG enabled, no
value is reported.
Signed-off-by: Vasilis Liaskovitis <address@hidden>
Signed-off-by: Mohammed Gamal <address@hidden>
Signed-off-by: Eduardo Otubo <address@hidden>
Signed-off-by: Vadim Galitsyn <address@hidden>
Reviewed-by: Eugene Crosser <address@hidden>
Cc: Dr. David Alan Gilbert <address@hidden>
Cc: Markus Armbruster <address@hidden>
Cc: Igor Mammedov <address@hidden>
Cc: Eric Blake <address@hidden>
Cc: address@hidden
Message-Id: <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Fixup comments as per Igor's review
Added 'of' from Vadim's reply
---
hw/mem/pc-dimm.c | 5 ++++
include/hw/mem/pc-dimm.h | 1 +
qapi-schema.json | 32 ++++++++++++++++++++++
qmp.c | 13 +++++++++
stubs/Makefile.objs | 2 +-
stubs/{qmp_pc_dimm_device_list.c => qmp_pc_dimm.c} | 5 ++++
6 files changed, 57 insertions(+), 1 deletion(-)
rename stubs/{qmp_pc_dimm_device_list.c => qmp_pc_dimm.c} (68%)
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index bdf6649083..66eace5a5c 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -159,6 +159,11 @@ uint64_t pc_existing_dimms_capacity(Error **errp)
return cap.size;
}
+uint64_t get_plugged_memory_size(void)
+{
+ return pc_existing_dimms_capacity(&error_abort);
+}
+
int qmp_pc_dimm_device_list(Object *obj, void *opaque)
{
MemoryDeviceInfoList ***prev = opaque;
diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index 6f8c3eb1b3..d83b957829 100644
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -95,6 +95,7 @@ int pc_dimm_get_free_slot(const int *hint, int max_slots,
Error **errp);
int qmp_pc_dimm_device_list(Object *obj, void *opaque);
uint64_t pc_existing_dimms_capacity(Error **errp);
+uint64_t get_plugged_memory_size(void);
void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms,
MemoryRegion *mr, uint64_t align, Error **errp);
void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms,
diff --git a/qapi-schema.json b/qapi-schema.json
index f3af2cb851..cdff39a456 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1966,6 +1966,38 @@
'*unavailable-features': [ 'str' ], 'typename': 'str' } }
##
+# @MemoryInfo:
+#
+# Actual memory information in bytes.
+#
+# @base-memory: size of "base" memory specified with command line
+# option -m.
+#
+# @plugged-memory: size of memory that can be hot-unplugged. This field
+# is omitted if target doesn't support memory hotplug
+# (i.e. CONFIG_MEM_HOTPLUG not defined on build time).
+#
+# Since: 2.11.0
+##
+{ 'struct': 'MemoryInfo',
+ 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } }
+
+##
+# @query-memory-size-summary:
+#
+# Return the amount of initially allocated and present hotpluggable (if
+# enabled) memory in bytes.
+#
+# Example:
+#
+# -> { "execute": "query-memory-size-summary" }
+# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } }
+#
+# Since: 2.11.0
+##
+{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' }
+
+##
# @query-cpu-definitions:
#
# Return a list of supported virtual CPU definitions
diff --git a/qmp.c b/qmp.c
index b86201e349..e8c303116a 100644
--- a/qmp.c
+++ b/qmp.c
@@ -709,3 +709,16 @@ ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp)
return head;
}
+
+MemoryInfo *qmp_query_memory_size_summary(Error **errp)
+{
+ MemoryInfo *mem_info = g_malloc0(sizeof(MemoryInfo));
+
+ mem_info->base_memory = ram_size;
+
+ mem_info->plugged_memory = get_plugged_memory_size();
+ mem_info->has_plugged_memory =
+ mem_info->plugged_memory != (uint64_t)-1;
+
+ return mem_info;
+}
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 4a33495911..c7594796c3 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -33,7 +33,7 @@ stub-obj-y += uuid.o
stub-obj-y += vm-stop.o
stub-obj-y += vmstate.o
stub-obj-$(CONFIG_WIN32) += fd-register.o
-stub-obj-y += qmp_pc_dimm_device_list.o
+stub-obj-y += qmp_pc_dimm.o
stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += pc_madt_cpu_entry.o
diff --git a/stubs/qmp_pc_dimm_device_list.c b/stubs/qmp_pc_dimm.c
similarity index 68%
rename from stubs/qmp_pc_dimm_device_list.c
rename to stubs/qmp_pc_dimm.c
index def211564d..9ddc4f619a 100644
--- a/stubs/qmp_pc_dimm_device_list.c
+++ b/stubs/qmp_pc_dimm.c
@@ -6,3 +6,8 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque)
{
return 0;
}
+
+uint64_t get_plugged_memory_size(void)
+{
+ return (uint64_t)-1;
+}
--
2.13.5
- [Qemu-devel] [PULL 0/7] hmp queue, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 2/7] hmp: fix "dump-quest-memory" segfault (arm), Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 1/7] hmp: fix "dump-quest-memory" segfault (ppc), Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 3/7] dump: do not dump non-existent guest memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 4/7] tests/hmp: test "none" machine with memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 5/7] hmp: extend "info numa" with hotplugged memory information, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 7/7] hmp: introduce 'info memory_size_summary' command, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 6/7] qmp: introduce query-memory-size-summary command,
Dr. David Alan Gilbert (git) <=
- Re: [Qemu-devel] [PULL 0/7] hmp queue, Peter Maydell, 2017/09/14