From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgEaQ-00007Q-1W for qemu-devel@nongnu.org; Mon, 20 Oct 2014 11:09:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgEaP-0000eg-01 for qemu-devel@nongnu.org; Mon, 20 Oct 2014 11:09:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgEaO-0000eN-Mn for qemu-devel@nongnu.org; Mon, 20 Oct 2014 11:09:28 -0400 Date: Mon, 20 Oct 2014 17:09:17 +0200 From: Igor Mammedov Message-ID: <20141020170917.1c2a5379@nial.usersys.redhat.com> In-Reply-To: <1412907367-28297-9-git-send-email-guz.fnst@cn.fujitsu.com> References: <1412907367-28297-1-git-send-email-guz.fnst@cn.fujitsu.com> <1412907367-28297-9-git-send-email-guz.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V5 8/8] acpi/cpu-hotplug: introduce helper function to keep bit setting in one place List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gu Zheng Cc: chen.fan.fnst@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, qemu-devel@nongnu.org, afaerber@suse.de, tangchen@cn.fujitsu.com On Fri, 10 Oct 2014 10:16:07 +0800 Gu Zheng 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 > --- > v5: > -rename acpi_set_local_sts to acpi_set_cpu_present_bit for better readability. > > hw/acpi/cpu_hotplug.c | 23 +++++++++++++++-------- > 1 files changed, 15 insertions(+), 8 deletions(-) > > diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c > index ae48b63..8b8d15a 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,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_cpu_present_bit(gpe_cpu, cpu, &local_err); > + g_assert(local_err == NULL); it would be nice to report error before dying, using error_abort instead of local_err will do that for you. > } > memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops, > gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN);