On Wed, 17 Sep 2014 09:24:03 +0800
Gu Zheng <guz.f...@cn.fujitsu.com> wrote:
> Introduce help function acpi_set_local_sts() to simplify acpi_cpu_plug_cb
> and acpi_cpu_hotplug_init, so that we can keep bit setting in one place.
>
> Signed-off-by: Gu Zheng <guz.f...@cn.fujitsu.com>
> ---
> hw/acpi/cpu_hotplug.c | 22 +++++++++++++++-------
> 1 files changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
> index 7629686..d42c961 100644
> --- a/hw/acpi/cpu_hotplug.c
> +++ b/hw/acpi/cpu_hotplug.c
> @@ -36,8 +36,8 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = {
> },
> };
>
> -void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
> - AcpiCpuHotplug *g, CPUState *cpu, Error **errp)
> +static void acpi_set_local_sts(AcpiCpuHotplug *g, CPUState *cpu,
> + Error **errp)
> {
> CPUClass *k = CPU_GET_CLASS(cpu);
> int64_t cpu_id;
> @@ -48,9 +48,18 @@ void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
> return;
> }
>
> - ar->gpe.sts[0] |= ACPI_CPU_HOTPLUG_STATUS;
> g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
> +}
>
> +void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
> + AcpiCpuHotplug *g, CPUState *cpu, Error **errp)
> +{
> + acpi_set_local_sts(g, cpu, errp);
> + if (*errp != NULL) {
> + return;
> + }
> +
> + ar->gpe.sts[0] |= ACPI_CPU_HOTPLUG_STATUS;
^^^ shouldn't be set for coldplugged CPUs along with IRQ below
> acpi_update_sci(ar, irq);
> }
>
> @@ -60,11 +69,10 @@ void acpi_cpu_hotplug_init(MemoryRegion *parent, Object
> *owner,
> CPUState *cpu;
>
> CPU_FOREACH(cpu) {
> - CPUClass *cc = CPU_GET_CLASS(cpu);
> - int64_t id = cc->get_arch_id(cpu);
> + Error *local_err = NULL;
>
> - g_assert((id / 8) < ACPI_GPE_PROC_LEN);
> - gpe_cpu->sts[id / 8] |= (1 << (id % 8));
> + acpi_set_local_sts(gpe_cpu, cpu, &local_err);
> + g_assert(local_err == NULL);
Wouldn't acpi_cpu_plug_cb() do everything this FOREACH does?
I've suggest to drop CPU_FOREACH() altogether.
> }
> memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops,
> gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN);
