On Fri, 10 Oct 2014 10:16:02 +0800 Gu Zheng <guz.f...@cn.fujitsu.com> wrote:
> Convert notifier based hotplug to hotplug_handler API, > and remove the unused AcpiCpuHotplug_add(). > > Signed-off-by: Gu Zheng <guz.f...@cn.fujitsu.com> Reviewed-by: Igor Mammedov <imamm...@redhat.com> > --- > v5: > -drop 'handle' from the comment and subject. > v2: > -remove the unused AcpiCpuHotplug_add(). > > hw/acpi/cpu_hotplug.c | 14 ++------------ > hw/acpi/piix4.c | 14 ++------------ > include/hw/acpi/cpu_hotplug.h | 2 -- > 3 files changed, 4 insertions(+), 26 deletions(-) > > diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c > index 06e9c61..b69b16c 100644 > --- a/hw/acpi/cpu_hotplug.c > +++ b/hw/acpi/cpu_hotplug.c > @@ -49,22 +49,12 @@ void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, > return; > } > > - AcpiCpuHotplug_add(&ar->gpe, g, cpu); > + ar->gpe.sts[0] |= ACPI_CPU_HOTPLUG_STATUS; > + g->sts[cpu_id / 8] |= (1 << (cpu_id % 8)); > > acpi_update_sci(ar, irq); > } > > -void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu) > -{ > - CPUClass *k = CPU_GET_CLASS(cpu); > - int64_t cpu_id; > - > - *gpe->sts = *gpe->sts | ACPI_CPU_HOTPLUG_STATUS; > - cpu_id = k->get_arch_id(CPU(cpu)); > - g_assert((cpu_id / 8) < ACPI_GPE_PROC_LEN); > - g->sts[cpu_id / 8] |= (1 << (cpu_id % 8)); > -} > - > void AcpiCpuHotplug_init(MemoryRegion *parent, Object *owner, > AcpiCpuHotplug *gpe_cpu, uint16_t base) > { > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index b72b34e..8320b18 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -83,7 +83,6 @@ typedef struct PIIX4PMState { > uint8_t s4_val; > > AcpiCpuHotplug gpe_cpu; > - Notifier cpu_added_notifier; > > MemHotplugState acpi_memory_hotplug; > } PIIX4PMState; > @@ -348,6 +347,8 @@ static void piix4_device_plug_cb(HotplugHandler > *hotplug_dev, > } 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 if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > + acpi_cpu_plug_cb(&s->ar, s->irq, &s->gpe_cpu, dev, errp); > } else { > error_setg(errp, "acpi: device plug request for not supported device" > " type: %s", object_get_typename(OBJECT(dev))); > @@ -544,15 +545,6 @@ static const MemoryRegionOps piix4_gpe_ops = { > .endianness = DEVICE_LITTLE_ENDIAN, > }; > > -static void piix4_cpu_added_req(Notifier *n, void *opaque) > -{ > - PIIX4PMState *s = container_of(n, PIIX4PMState, cpu_added_notifier); > - > - assert(s != NULL); > - AcpiCpuHotplug_add(&s->ar.gpe, &s->gpe_cpu, CPU(opaque)); > - acpi_update_sci(&s->ar, s->irq); > -} > - > static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, > PCIBus *bus, PIIX4PMState *s) > { > @@ -565,8 +557,6 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion > *parent, > > AcpiCpuHotplug_init(parent, OBJECT(s), &s->gpe_cpu, > 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); > diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h > index 5dca8d7..4657e71 100644 > --- a/include/hw/acpi/cpu_hotplug.h > +++ b/include/hw/acpi/cpu_hotplug.h > @@ -23,8 +23,6 @@ typedef struct AcpiCpuHotplug { > void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, > AcpiCpuHotplug *g, DeviceState *dev, Error **errp); > > -void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu); > - > void AcpiCpuHotplug_init(MemoryRegion *parent, Object *owner, > AcpiCpuHotplug *gpe_cpu, uint16_t base); > #endif