mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc: add memory hotplug handler to PC_MACHINE

Browse Source 
that will perform mapping of PC_DIMM device into guest's RAM address space

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2014-06-02 15:25:12 +02:00 committed by Michael S. Tsirkin
parent ca8336f385
commit 95bee274fd
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
hw/i386/pc.c
View File

@ -58,6 +58,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/pci/pci_host.h" #include "hw/pci/pci_host.h"
#include "acpi-build.h" #include "acpi-build.h"
#include "hw/mem/pc-dimm.h"
/* debug PC/ISA interrupts */ /* debug PC/ISA interrupts */
//#define DEBUG_IRQ //#define DEBUG_IRQ
@ -1543,12 +1544,70 @@ void qemu_register_pc_machine(QEMUMachine *m)
g_free(name); 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);
uint64_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 = { static const TypeInfo pc_machine_info = {
.name = TYPE_PC_MACHINE, .name = TYPE_PC_MACHINE,
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.abstract = true, .abstract = true,
.instance_size = sizeof(PCMachineState), .instance_size = sizeof(PCMachineState),
.class_size = sizeof(PCMachineClass), .class_size = sizeof(PCMachineClass),
.class_init = pc_machine_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_HOTPLUG_HANDLER },
{ }
},
}; };
static void pc_machine_register_types(void) static void pc_machine_register_types(void)

8
include/hw/i386/pc.h
View File

@ -31,9 +31,17 @@ struct PCMachineState {
MemoryRegion hotplug_memory; MemoryRegion hotplug_memory;
}; };
/**
* PCMachineClass:
* @get_hotplug_handler: pointer to parent class callback @get_hotplug_handler
*/
struct PCMachineClass { struct PCMachineClass {
/*< private >*/ /*< private >*/
MachineClass parent_class; MachineClass parent_class;
/*< public >*/
HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
DeviceState *dev);
}; };
typedef struct PCMachineState PCMachineState; typedef struct PCMachineState PCMachineState;