[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/16] pc-dimm: Make pc_existing_dimms_capacity globa
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 15/16] pc-dimm: Make pc_existing_dimms_capacity global |
Date: |
Tue, 27 Jan 2015 15:14:40 +0200 |
From: Bharata B Rao <address@hidden>
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 <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/mem/pc-dimm.h | 1 +
hw/i386/pc.c | 24 ------------------------
hw/mem/pc-dimm.c | 25 +++++++++++++++++++++++++
3 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index e1dcbbc..bbfa53f 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
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 125cf0a..2ec45a4 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 d431834..f02ce6e 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)
{
--
MST
- [Qemu-devel] [PULL 00/16] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 02/16] Add some trace calls to pci.c., Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 01/16] ich9: add disable_s3, disable_s4, s4_val properties, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 05/16] acpi-test: update expected DSDT, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 06/16] acpi: update generated hex files, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 04/16] pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 14/16] pc: Fix DIMMs capacity calculation, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 15/16] pc-dimm: Make pc_existing_dimms_capacity global,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 16/16] pc-dimm: Add Error argument to pc_existing_dimms_capacity, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 11/16] bios-linker-loader: move source to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 12/16] smbios: Fix dimm size calculation when RAM is multiple of 16GB, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 09/16] virtio: fix feature bit checks, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 03/16] pci: Split pcie_host_mmcfg_map(), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 13/16] smbios: Don't report unknown CPU speed (fix SVVP regression), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 10/16] bios-linker-loader: move header to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 07/16] acpi: build_append_nameseg(): add padding if necessary, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 08/16] bios-tables-test: split piix4 and q35 tests, Michael S. Tsirkin, 2015/01/27
- Re: [Qemu-devel] [PULL 00/16] pci, pc, virtio fixes and cleanups, Peter Maydell, 2015/01/27