[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V6 8/8] acpi/cpu-hotplug: introduce helper funct
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH V6 8/8] acpi/cpu-hotplug: introduce helper function to keep bit setting in one place |
Date: |
Wed, 22 Oct 2014 11:00:12 +0200 |
On Wed, 22 Oct 2014 11:24:32 +0800
Gu Zheng <address@hidden> wrote:
> Introduce helper function acpi_set_cpu_present_bit() 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 <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
> ---
> v6:
> -using error_abort instead of local_err, so that we can gain the error report
> before abort (suggested by Igor).
> v5:
> -rename acpi_set_local_sts to acpi_set_cpu_present_bit for better
> readability.
>
> hw/acpi/cpu_hotplug.c | 22 +++++++++++++---------
> 1 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
> index ae48b63..b8ebfad 100644
> --- a/hw/acpi/cpu_hotplug.c
> +++ b/hw/acpi/cpu_hotplug.c
> @@ -36,10 +36,9 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = {
> },
> };
>
> -void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
> - AcpiCpuHotplug *g, DeviceState *dev, Error **errp)
> +static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu,
> + Error **errp)
> {
> - CPUState *cpu = CPU(dev);
> CPUClass *k = CPU_GET_CLASS(cpu);
> int64_t cpu_id;
>
> @@ -49,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, DeviceState *dev, Error **errp)
> +{
> + acpi_set_cpu_present_bit(g, CPU(dev), errp);
> + if (*errp != NULL) {
> + return;
> + }
>
> + ar->gpe.sts[0] |= ACPI_CPU_HOTPLUG_STATUS;
> acpi_update_sci(ar, irq);
> }
>
> @@ -61,11 +69,7 @@ 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);
> -
> - g_assert((id / 8) < ACPI_GPE_PROC_LEN);
> - gpe_cpu->sts[id / 8] |= (1 << (id % 8));
> + acpi_set_cpu_present_bit(gpe_cpu, cpu, &error_abort);
> }
> memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops,
> gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN);
- [Qemu-devel] [PATCH V6 0/8] cpu/acpi: convert cpu hot plug to hotplug_handler API, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 1/8] acpi/cpu: add cpu hotplug callback function to match hotplug_handler API, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 2/8] acpi:ich9: convert cpu hotplug to hotplug_handler API, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 3/8] acpi:piix4: convert cpu hotplug to hotplug_handler API, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 4/8] pc: add cpu hotplug handler to PC_MACHINE, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 5/8] pc: Update rtc_cmos in pc_cpu_plug, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 6/8] qom/cpu: remove the unused CPU hot-plug notifier, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 7/8] cpu-hotplug: rename function for better readability, Gu Zheng, 2014/10/21
- [Qemu-devel] [PATCH V6 8/8] acpi/cpu-hotplug: introduce helper function to keep bit setting in one place, Gu Zheng, 2014/10/21
- Re: [Qemu-devel] [PATCH V6 8/8] acpi/cpu-hotplug: introduce helper function to keep bit setting in one place,
Igor Mammedov <=
- Re: [Qemu-devel] [PATCH V6 0/8] cpu/acpi: convert cpu hot plug to hotplug_handler API, Gu Zheng, 2014/10/24