diff options
| author | Bharata B Rao <bharata@linux.vnet.ibm.com> | 2015-01-27 09:35:01 +0530 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-01-27 14:46:18 +0200 |
| commit | 9967c94957f60c2d1cadbe0bfd4373a13fb1a226 (patch) | |
| tree | e879370f9121fba989e85d64fccb0bf6d165d94e | |
| parent | 759048ac20174b34fa7a593f4da2e7fed34e599c (diff) | |
| download | focaccia-qemu-9967c94957f60c2d1cadbe0bfd4373a13fb1a226.tar.gz focaccia-qemu-9967c94957f60c2d1cadbe0bfd4373a13fb1a226.zip | |
pc-dimm: Make pc_existing_dimms_capacity global
Move pc_existing_dimms_capacity() to pc-dimm.c since it would be needed by PowerPC memory hotplug code too. Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/i386/pc.c | 24 | ||||
| -rw-r--r-- | hw/mem/pc-dimm.c | 25 | ||||
| -rw-r--r-- | include/hw/mem/pc-dimm.h | 1 |
3 files changed, 26 insertions, 24 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 125cf0ad7c..2ec45a4be0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1552,30 +1552,6 @@ void qemu_register_pc_machine(QEMUMachine *m) g_free(name); } -static int pc_existing_dimms_capacity(Object *obj, void *opaque) -{ - Error *local_err = NULL; - uint64_t *size = opaque; - - if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { - DeviceState *dev = DEVICE(obj); - - if (dev->realized) { - (*size) += object_property_get_int(obj, PC_DIMM_SIZE_PROP, - &local_err); - } - - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - return 1; - } - } - - object_child_foreach(obj, pc_existing_dimms_capacity, opaque); - return 0; -} - static void pc_dimm_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index d431834030..f02ce6e04c 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -22,6 +22,31 @@ #include "qemu/config-file.h" #include "qapi/visitor.h" #include "qemu/range.h" +#include "qapi/qmp/qerror.h" + +int pc_existing_dimms_capacity(Object *obj, void *opaque) +{ + Error *local_err = NULL; + uint64_t *size = opaque; + + if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { + DeviceState *dev = DEVICE(obj); + + if (dev->realized) { + (*size) += object_property_get_int(obj, PC_DIMM_SIZE_PROP, + &local_err); + } + + if (local_err) { + qerror_report_err(local_err); + error_free(local_err); + return 1; + } + } + + object_child_foreach(obj, pc_existing_dimms_capacity, opaque); + return 0; +} int qmp_pc_dimm_device_list(Object *obj, void *opaque) { diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index e1dcbbcd58..bbfa53f3a4 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -78,4 +78,5 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); int qmp_pc_dimm_device_list(Object *obj, void *opaque); +int pc_existing_dimms_capacity(Object *obj, void *opaque); #endif |