Commit 9aa3397f authored by Vadim Galitsyn's avatar Vadim Galitsyn Committed by Dr. David Alan Gilbert
Browse files

qmp: introduce query-memory-size-summary command 



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: default avatarVasilis Liaskovitis <vasilis.liaskovitis@profitbricks.com>
Signed-off-by: default avatarMohammed Gamal <mohammed.gamal@profitbricks.com>
Signed-off-by: default avatarEduardo Otubo <eduardo.otubo@profitbricks.com>
Signed-off-by: default avatarVadim Galitsyn <vadim.galitsyn@profitbricks.com>
Reviewed-by: default avatarEugene Crosser <evgenii.cherkashin@profitbricks.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Cc: qemu-devel@nongnu.org
Message-Id: <20170829153022.27004-3-vadim.galitsyn@profitbricks.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
  Fixup comments as per Igor's review
  Added 'of' from Vadim's reply
parent 31959e82

hw/mem/pc-dimm.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

include/hw/mem/pc-dimm.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

qapi-schema.json

+32 −0
Original line number Diff line number Diff line
@@ -1965,6 +1965,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 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:

#

qmp.c

+13 −0
Original line number Diff line number Diff line
@@ -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;

}

stubs/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -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