[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 16/33] pc: add memory hotplug handler to PC_MACHI
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v4 16/33] pc: add memory hotplug handler to PC_MACHINE |
Date: |
Mon, 2 Jun 2014 15:25:12 +0200 |
that will perform mapping of PC_DIMM device into guest's RAM address space
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/pc.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/i386/pc.h | 8 ++++++
2 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index af68c99..93ead25 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -58,6 +58,7 @@
#include "hw/boards.h"
#include "hw/pci/pci_host.h"
#include "acpi-build.h"
+#include "hw/mem/pc-dimm.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
@@ -1547,12 +1548,70 @@ void qemu_register_pc_machine(QEMUMachine *m)
g_free(name);
}
+static void pc_dimm_plug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ Error *local_err = NULL;
+ PCMachineState *pcms = PC_MACHINE(hotplug_dev);
+ PCDIMMDevice *dimm = PC_DIMM(dev);
+ PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
+ MemoryRegion *mr = ddc->get_memory_region(dimm);
+ ram_addr_t addr = object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP,
+ &local_err);
+ if (local_err) {
+ goto out;
+ }
+
+ memory_region_add_subregion(&pcms->hotplug_memory,
+ addr - pcms->hotplug_memory_base, mr);
+ vmstate_register_ram(mr, dev);
+out:
+ error_propagate(errp, local_err);
+}
+
+static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ pc_dimm_plug(hotplug_dev, dev, errp);
+ }
+}
+
+static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
+ DeviceState *dev)
+{
+ PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine);
+
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ return HOTPLUG_HANDLER(machine);
+ }
+
+ return pcmc->get_hotplug_handler ?
+ pcmc->get_hotplug_handler(machine, dev) : NULL;
+}
+
+static void pc_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ PCMachineClass *pcmc = PC_MACHINE_CLASS(oc);
+ HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
+
+ pcmc->get_hotplug_handler = mc->get_hotplug_handler;
+ mc->get_hotplug_handler = pc_get_hotpug_handler;
+ hc->plug = pc_machine_device_plug_cb;
+}
+
static const TypeInfo pc_machine_info = {
.name = TYPE_PC_MACHINE,
.parent = TYPE_MACHINE,
.abstract = true,
.instance_size = sizeof(PCMachineState),
.class_size = sizeof(PCMachineClass),
+ .class_init = pc_machine_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_HOTPLUG_HANDLER },
+ { }
+ },
};
static void pc_machine_register_types(void)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 3fed471..e541c51 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -31,9 +31,17 @@ struct PCMachineState {
MemoryRegion hotplug_memory;
};
+/**
+ * PCMachineClass:
+ * @get_hotplug_handler: pointer to parent class callback @get_hotplug_handler
+ */
struct PCMachineClass {
/*< private >*/
MachineClass parent_class;
+
+ /*< public >*/
+ HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
+ DeviceState *dev);
};
typedef struct PCMachineState PCMachineState;
--
1.7.1
- [Qemu-devel] [PATCH v4 09/33] pc: implement pc-dimm device abstraction, (continued)
- [Qemu-devel] [PATCH v4 09/33] pc: implement pc-dimm device abstraction, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 08/33] qdev: expose DeviceState.hotplugged field as a property, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 06/33] vl.c: extend -m option to support options for memory hotplug, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 11/33] pc-dimm: do not allow to set already used memdev, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 10/33] memory: add memory_region_is_mapped() API, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 12/33] pc: initialize memory hotplug address space, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 13/33] pc: exit QEMU if number of slots more than supported 256, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 14/33] pc: add 'etc/reserved-memory-end' fw_cfg interface for SeaBIOS, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 15/33] pc: exit QEMU if compat machine doesn't support memory hotlpug, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 17/33] pc-dimm: add busy address check and address auto-allocation, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 16/33] pc: add memory hotplug handler to PC_MACHINE,
Igor Mammedov <=
- [Qemu-devel] [PATCH v4 18/33] pc-dimm: add busy slot check and slot auto-allocation, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 19/33] acpi: rename cpu_hotplug_defs.h to pc-hotplug.h, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 20/33] acpi: memory hotplug ACPI hardware implementation, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 21/33] trace: add acpi memory hotplug IO region events, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 23/33] acpi:piix4: allow plug/unlug callbacks handle not only PCI devices, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 22/33] trace: pc: add PC_DIMM slot & address allocation, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 25/33] pc: ich9 lpc: make it work with global/compat properties, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 24/33] acpi:piix4: add memory hotplug handling, Igor Mammedov, 2014/06/02
- [Qemu-devel] [PATCH v4 26/33] acpi:ich9: add memory hotplug handling, Igor Mammedov, 2014/06/02