diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-06-02 15:25:20 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 16:41:50 +0300 |
| commit | 34774320c3b05287a06775c31578bd1e2cb20b83 (patch) | |
| tree | 708ca0416187bccf0a70031bea5974c59c05bb7e /include/hw | |
| parent | f1adc360b4ea3ed3bf3a5061681a986b0df85ad7 (diff) | |
| download | qemu-34774320c3b05287a06775c31578bd1e2cb20b83.zip | |
acpi:piix4: add memory hotplug handling
Add memory hotplug initialization/handling to PIIX4_PM device
and enable it by default for post 2.0 machine types
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>
MST: resolve conflict in pc.h
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/acpi/memory_hotplug.h | 1 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h index 8f90f72fdb..912c53f3ea 100644 --- a/include/hw/acpi/memory_hotplug.h +++ b/include/hw/acpi/memory_hotplug.h @@ -15,6 +15,7 @@ typedef struct MemStatus { } MemStatus; typedef struct MemHotplugState { + bool is_enabled; /* true if memory hotplug is supported */ MemoryRegion io; uint32_t selector; uint32_t dev_count; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c3ed8586df..f6d41729c5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -311,10 +311,16 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); #define PC_COMPAT_2_0 \ {\ + .driver = "PIIX4_PM",\ + .property = "memory-hotplug-support",\ + .value = "off",\ + },\ + {\ .driver = "apic",\ .property = "version",\ .value = stringify(0x11),\ - },{\ + },\ + {\ .driver = "nec-usb-xhci",\ .property = "superspeed-ports-first",\ .value = "off",\ |