piix4_acpi_system_hot_add_init() handles not only memory hot add initialization, but the whole memory hotplug initialization. So rename it to piix4_acpi_system_hotplug_init().
Signed-off-by: Tang Chen <tangc...@cn.fujitsu.com> --- hw/acpi/piix4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c1d5187..1a15e5e 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -93,7 +93,7 @@ typedef struct PIIX4PMState { #define PIIX4_PM(obj) \ OBJECT_CHECK(PIIX4PMState, (obj), TYPE_PIIX4_PM) -static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, +static void piix4_acpi_system_hotplug_init(MemoryRegion *parent, PCIBus *bus, PIIX4PMState *s); #define ACPI_ENABLE 0xf1 @@ -468,7 +468,7 @@ static int piix4_pm_initfn(PCIDevice *dev) qemu_add_machine_init_done_notifier(&s->machine_ready); qemu_register_reset(piix4_reset, s); - piix4_acpi_system_hot_add_init(pci_address_space_io(dev), dev->bus, s); + piix4_acpi_system_hotplug_init(pci_address_space_io(dev), dev->bus, s); piix4_pm_add_propeties(s); return 0; @@ -556,7 +556,7 @@ static void piix4_cpu_added_req(Notifier *n, void *opaque) acpi_update_sci(&s->ar, s->irq); } -static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, +static void piix4_acpi_system_hotplug_init(MemoryRegion *parent, PCIBus *bus, PIIX4PMState *s) { memory_region_init_io(&s->io_gpe, OBJECT(s), &piix4_gpe_ops, s, -- 1.8.4.2