diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2016-12-06 00:32:28 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2017-01-10 07:03:24 +0200 |
| commit | 80db0e7822962554c91bef05d784c898e8ab1c3c (patch) | |
| tree | c62e40df1b60281f063d59a741af40c5e8f2836c /include/hw/acpi | |
| parent | c9c085458060db9a63fa05c51e33c75e8390b2dc (diff) | |
| download | qemu-80db0e7822962554c91bef05d784c898e8ab1c3c.zip qemu-80db0e7822962554c91bef05d784c898e8ab1c3c.tar.gz qemu-80db0e7822962554c91bef05d784c898e8ab1c3c.tar.bz2 | |
memhp: don't generate memory hotplug AML if it's not enabled/supported
That reduces DSDT by 910 bytes when memory hotplug
isn't enabled.
While doing so drop intermediate variables/arguments
passing around ACPI_MEMORY_HOTPLUG_IO_LEN and making
it local to memory_hotplug.c, hardcoding it there as
it can't change.
Also don't pass around ACPI_MEMORY_HOTPLUG_BASE through
intermediate variables/arguments where it's not needed.
Instead initialize in module static variable when MMIO
region is mapped and use that within memory_hotplug.c
whenever it's required.
That way MMIO base specified only at one place and AML
with MMIO would always use the same value.
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>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Diffstat (limited to 'include/hw/acpi')
| -rw-r--r-- | include/hw/acpi/memory_hotplug.h | 3 | ||||
| -rw-r--r-- | include/hw/acpi/pc-hotplug.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h index 91d4045..db8ebc9 100644 --- a/include/hw/acpi/memory_hotplug.h +++ b/include/hw/acpi/memory_hotplug.h @@ -30,7 +30,7 @@ typedef struct MemHotplugState { } MemHotplugState; void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner, - MemHotplugState *state); + MemHotplugState *state, uint16_t io_base); void acpi_memory_plug_cb(HotplugHandler *hotplug_dev, MemHotplugState *mem_st, DeviceState *dev, Error **errp); @@ -48,7 +48,6 @@ extern const VMStateDescription vmstate_memory_hotplug; void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list); void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem, - uint16_t io_base, uint16_t io_len, const char *res_root, const char *event_handler_method); #endif diff --git a/include/hw/acpi/pc-hotplug.h b/include/hw/acpi/pc-hotplug.h index a4f513d..31bc919 100644 --- a/include/hw/acpi/pc-hotplug.h +++ b/include/hw/acpi/pc-hotplug.h @@ -29,7 +29,6 @@ #define PIIX4_CPU_HOTPLUG_IO_BASE 0xaf00 #define CPU_HOTPLUG_RESOURCE_DEVICE PRES -#define ACPI_MEMORY_HOTPLUG_IO_LEN 24 #define ACPI_MEMORY_HOTPLUG_BASE 0x0a00 #endif |