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 | |
| parent | f1adc360b4ea3ed3bf3a5061681a986b0df85ad7 (diff) | |
| download | qemu-34774320c3b05287a06775c31578bd1e2cb20b83.tar.gz qemu-34774320c3b05287a06775c31578bd1e2cb20b83.tar.bz2 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
| -rw-r--r-- | hw/acpi/piix4.c | 15 | ||||
| -rw-r--r-- | include/hw/acpi/memory_hotplug.h | 1 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 8 |
3 files changed, 22 insertions, 2 deletions
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c9c6b8b619..5c542b764b 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -33,6 +33,8 @@ #include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/hotplug.h" +#include "hw/mem/pc-dimm.h" +#include "hw/acpi/memory_hotplug.h" //#define DEBUG @@ -81,6 +83,8 @@ typedef struct PIIX4PMState { AcpiCpuHotplug gpe_cpu; Notifier cpu_added_notifier; + + MemHotplugState acpi_memory_hotplug; } PIIX4PMState; #define TYPE_PIIX4_PM "PIIX4_PM" @@ -313,7 +317,10 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev, { PIIX4PMState *s = PIIX4_PM(hotplug_dev); - if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { + if (s->acpi_memory_hotplug.is_enabled && + object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + acpi_memory_plug_cb(&s->ar, s->irq, &s->acpi_memory_hotplug, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { acpi_pcihp_device_plug_cb(&s->ar, s->irq, &s->acpi_pci_hotplug, dev, errp); } else { @@ -531,6 +538,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, PIIX4_CPU_HOTPLUG_IO_BASE); s->cpu_added_notifier.notify = piix4_cpu_added_req; qemu_register_cpu_added_notifier(&s->cpu_added_notifier); + + if (s->acpi_memory_hotplug.is_enabled) { + acpi_memory_hotplug_init(parent, OBJECT(s), &s->acpi_memory_hotplug); + } } static Property piix4_pm_properties[] = { @@ -540,6 +551,8 @@ static Property piix4_pm_properties[] = { DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2), DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, use_acpi_pci_hotplug, true), + DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, + acpi_memory_hotplug.is_enabled, true), DEFINE_PROP_END_OF_LIST(), }; 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",\ |