Re: [Qemu-devel] [PATCH V5 2/8] acpi:ich9: convert cpu hotplug to hotplug_handler API

[Igor Mammedov]

On Fri, 10 Oct 2014 10:16:01 +0800
Gu Zheng <address@hidden> wrote:

> Convert notifier based hotplug to hotplug_handler API.
> 
> Signed-off-by: Gu Zheng <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>

> ---
> v5:
>  -drop 'handle' from the comment and subject.
> 
>  hw/acpi/ich9.c         |   13 ++-----------
>  include/hw/acpi/ich9.h |    1 -
>  2 files changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index 7b14bbb..7585364 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -209,15 +209,6 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
>      acpi_pm1_evt_power_down(&pm->acpi_regs);
>  }
>  
> -static void ich9_cpu_added_req(Notifier *n, void *opaque)
> -{
> -    ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, cpu_added_notifier);
> -
> -    assert(pm != NULL);
> -    AcpiCpuHotplug_add(&pm->acpi_regs.gpe, &pm->gpe_cpu, CPU(opaque));
> -    acpi_update_sci(&pm->acpi_regs, pm->irq);
> -}
> -
>  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
>                    qemu_irq sci_irq)
>  {
> @@ -246,8 +237,6 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
>  
>      AcpiCpuHotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
>                          &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
> -    pm->cpu_added_notifier.notify = ich9_cpu_added_req;
> -    qemu_register_cpu_added_notifier(&pm->cpu_added_notifier);
>  
>      if (pm->acpi_memory_hotplug.is_enabled) {
>          acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), 
> OBJECT(lpc_pci),
> @@ -304,6 +293,8 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, 
> DeviceState *dev, Error **errp)
>          object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
>          acpi_memory_plug_cb(&pm->acpi_regs, pm->irq, 
> &pm->acpi_memory_hotplug,
>                              dev, errp);
> +    } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> +        acpi_cpu_plug_cb(&pm->acpi_regs, pm->irq, &pm->gpe_cpu, dev, errp);
>      } else {
>          error_setg(errp, "acpi: device plug request for not supported device"
>                     " type: %s", object_get_typename(OBJECT(dev)));
> diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> index 7e42448..fe975e6 100644
> --- a/include/hw/acpi/ich9.h
> +++ b/include/hw/acpi/ich9.h
> @@ -47,7 +47,6 @@ typedef struct ICH9LPCPMRegs {
>      Notifier powerdown_notifier;
>  
>      AcpiCpuHotplug gpe_cpu;
> -    Notifier cpu_added_notifier;
>  
>      MemHotplugState acpi_memory_hotplug;
>  } ICH9LPCPMRegs;