From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsRyO-0005B4-Re for qemu-devel@nongnu.org; Thu, 14 Sep 2017 07:06:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsRyK-0000dT-9e for qemu-devel@nongnu.org; Thu, 14 Sep 2017 07:06:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsRyK-0000cr-1c for qemu-devel@nongnu.org; Thu, 14 Sep 2017 07:06:16 -0400 Date: Thu, 14 Sep 2017 12:06:08 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20170914110607.GD3982@work-vm> References: <20170829153022.27004-1-vadim.galitsyn@profitbricks.com> <20170829153022.27004-3-vadim.galitsyn@profitbricks.com> <20170914115746.382cf947@nial.brq.redhat.com> <20170914102628.GC3982@work-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v7 2/3] qmp: introduce query-memory-size-summary command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vadim Galitsyn Cc: Igor Mammedov , Eduardo Habkost , David Hildenbrand , Markus Armbruster , Eric Blake , qemu-devel@nongnu.org, Vasilis Liaskovitis , Mohammed Gamal , Eduardo Otubo * Vadim Galitsyn (vadim.galitsyn@profitbricks.com) wrote: > I think I made a typo here. It should be: > > +# @plugged-memory: size *of* memory that can be hot-unplugged. This field > +# is omitted if target does *not* support memory hotplug > +# (i.e. CONFIG_MEM_HOTPLUG not defined on build time). 'of' added, took the 'don't' from Igor's review. Dave > > > > On Thu, Sep 14, 2017 at 12:26 PM, Dr. David Alan Gilbert < > dgilbert@redhat.com> wrote: > > > * Igor Mammedov (imammedo@redhat.com) wrote: > > > On Tue, 29 Aug 2017 17:30:21 +0200 > > > Vadim Galitsyn wrote: > > > > > > > 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 > profitbricks.com> > > > > Signed-off-by: Mohammed Gamal > > > > Signed-off-by: Eduardo Otubo > > > > Signed-off-by: Vadim Galitsyn > > > > Reviewed-by: Eugene Crosser > > > > Cc: Dr. David Alan Gilbert > > > > Cc: Markus Armbruster > > > > Cc: Igor Mammedov > > > > Cc: Eric Blake > > > > Cc: qemu-devel@nongnu.org > > > > --- > > > > qapi-schema.json | 32 > > ++++++++++++++++++++++ > > > > include/hw/mem/pc-dimm.h | 1 + > > > > hw/mem/pc-dimm.c | 5 ++++ > > > > qmp.c | 13 +++++++++ > > > > stubs/{qmp_pc_dimm_device_list.c => qmp_pc_dimm.c} | 5 ++++ > > > > stubs/Makefile.objs | 2 +- > > > > 6 files changed, 57 insertions(+), 1 deletion(-) > > > > rename stubs/{qmp_pc_dimm_device_list.c => qmp_pc_dimm.c} (68%) > > > > > > > > diff --git a/qapi-schema.json b/qapi-schema.json > > > > index 802ea53d00..9402ac3b3a 100644 > > > > --- a/qapi-schema.json > > > > +++ b/qapi-schema.json > > > > @@ -4407,6 +4407,38 @@ > > > > 'data': { 'name': 'str', '*migration-safe': 'bool', 'static': > > 'bool', > > > > '*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 memory that can be hot-unplugged. This field > > > > +# is omitted if target does support memory hotplug > > > > +# (i.e. CONFIG_MEM_HOTPLUG not defined on build > > time). > > > field description doesn't match what's actually reported. > > > s/cat be/is/ > > > > Are you sure about that? That would read: > > size memory that is hot-unplugged > > > > which doesn't sound right, since it's not be hot-unplugged > > yet. > > > > Dave > > > > > s/does/doesn't/ > > > > > > > +# > > > > +# Since: 2.11.0 > > > > +## > > > > +{ 'struct': 'MemoryInfo', > > > > + 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } } > > > > + > > > > +## > > > > +# @query-memory-size-summary: > > > > +# > > > > +# Return the amount of initially allocated and hot-plugged (if > > > > +# enabled) memory in bytes. > > > it could count dimm's on CLI, so not only hotplugged > > > > > > s/hot-plugged/present hotpluggable/ > > > > > > > +# > > > > +# 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: > > > > # > > > > 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/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/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/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; > > > > +} > > > > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > > > > index e69c217aff..f5f139f310 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 > > > > > -- > > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK