Commit 08bba95b authored by Gu Zheng's avatar Gu Zheng Committed by Michael S. Tsirkin
Browse files

acpi:piix4: convert cpu hotplug to hotplug_handler API 



Convert notifier based hotplug to hotplug_handler API,
and remove the unused AcpiCpuHotplug_add().

Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
parent c5171ed0

hw/acpi/cpu_hotplug.c

+2 −12
Original line number Diff line number Diff line
@@ -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)

{

hw/acpi/piix4.c

+2 −12
Original line number Diff line number Diff line
@@ -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);

include/hw/acpi/cpu_hotplug.h

+0 −2
Original line number Diff line number Diff line
@@ -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