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

pc: add "hotplug-memory-region-size" property to PC_MACHINE

Browse Source 
... it will be used by acpi-build code and by unit tests

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.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:27 +02:00 committed by Michael S. Tsirkin
parent bef3492d11
commit bf1e893959
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/i386/pc.c
View File

@ -60,6 +60,7 @@
#include "acpi-build.h" #include "acpi-build.h"
#include "hw/mem/pc-dimm.h" #include "hw/mem/pc-dimm.h"
#include "trace.h" #include "trace.h"
#include "qapi/visitor.h"
/* debug PC/ISA interrupts */ /* debug PC/ISA interrupts */
//#define DEBUG_IRQ //#define DEBUG_IRQ
@ -1629,6 +1630,23 @@ static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
pcmc->get_hotplug_handler(machine, dev) : NULL; pcmc->get_hotplug_handler(machine, dev) : NULL;
} }
static void
pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
int64_t value = memory_region_size(&pcms->hotplug_memory);
visit_type_int(v, &value, name, errp);
}
static void pc_machine_initfn(Object *obj)
{
object_property_add(obj, PC_MACHINE_MEMHP_REGION_SIZE, "int",
pc_machine_get_hotplug_memory_region_size,
NULL, NULL, NULL, NULL);
}
static void pc_machine_class_init(ObjectClass *oc, void *data) static void pc_machine_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1645,6 +1663,7 @@ static const TypeInfo pc_machine_info = {
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.abstract = true, .abstract = true,
.instance_size = sizeof(PCMachineState), .instance_size = sizeof(PCMachineState),
.instance_init = pc_machine_initfn,
.class_size = sizeof(PCMachineClass), .class_size = sizeof(PCMachineClass),
.class_init = pc_machine_class_init, .class_init = pc_machine_class_init,
.interfaces = (InterfaceInfo[]) { .interfaces = (InterfaceInfo[]) {

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

@ -35,6 +35,7 @@ struct PCMachineState {
}; };
#define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device"
#define PC_MACHINE_MEMHP_REGION_SIZE "hotplug-memory-region-size"
/** /**
* PCMachineClass: * PCMachineClass: