From patchwork Wed Oct 22 03:24:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 401873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F399E140081 for ; Wed, 22 Oct 2014 14:46:17 +1100 (AEDT) Received: from localhost ([::1]:54634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgmsJ-0007We-Uz for incoming@patchwork.ozlabs.org; Tue, 21 Oct 2014 23:46:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgmrq-0006tu-Hi for qemu-devel@nongnu.org; Tue, 21 Oct 2014 23:45:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xgmri-0000X8-Jm for qemu-devel@nongnu.org; Tue, 21 Oct 2014 23:45:46 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:55242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgmri-0000X2-1Z for qemu-devel@nongnu.org; Tue, 21 Oct 2014 23:45:38 -0400 Received: from kw-mxoi1.gw.nic.fujitsu.com (unknown [10.0.237.133]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 3D9663EE0BB for ; Wed, 22 Oct 2014 12:45:37 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by kw-mxoi1.gw.nic.fujitsu.com (Postfix) with ESMTP id 301D7AC073B for ; Wed, 22 Oct 2014 12:45:36 +0900 (JST) Received: from s01.gw.fujitsu.co.jp (s01.gw.nic.fujitsu.com [133.161.11.16]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id CF8611DB8038 for ; Wed, 22 Oct 2014 12:45:35 +0900 (JST) Received: from s01.gw.fujitsu.co.jp (yt-mxio2.gw.nic.fujitsu.com [10.134.25.142]) by s01.gw.fujitsu.co.jp (Postfix) with ESMTP id 953173F0028; Wed, 22 Oct 2014 12:45:35 +0900 (JST) Received: from guz (unknown [10.167.226.100]) by s01.gw.fujitsu.co.jp (Postfix) with ESMTP id 31AC78A001; Wed, 22 Oct 2014 12:45:35 +0900 (JST) Received: (from root@localhost) by guz (8.14.5/8.14.5/Submit) id s9M3SnLE007884; Wed, 22 Oct 2014 11:28:49 +0800 From: Gu Zheng To: imammedo@redhat.com, qemu-devel@nongnu.org Date: Wed, 22 Oct 2014 11:24:27 +0800 Message-Id: <1413948272-7765-4-git-send-email-guz.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1413948272-7765-1-git-send-email-guz.fnst@cn.fujitsu.com> References: <1413948272-7765-1-git-send-email-guz.fnst@cn.fujitsu.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 192.51.44.36 Cc: chen.fan.fnst@cn.fujitsu.com, Gu Zheng , isimatu.yasuaki@jp.fujitsu.com, afaerber@suse.de, tangchen@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V6 3/8] acpi:piix4: convert cpu hotplug to hotplug_handler API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Convert notifier based hotplug to hotplug_handler API, and remove the unused AcpiCpuHotplug_add(). Reviewed-by: Igor Mammedov Signed-off-by: Gu Zheng --- v5: -drop 'handle' from the comment and subject. v2: -remove the unused AcpiCpuHotplug_add(). hw/acpi/cpu_hotplug.c | 14 ++------------ hw/acpi/piix4.c | 14 ++------------ include/hw/acpi/cpu_hotplug.h | 2 -- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 06e9c61..b69b16c 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -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) { diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index b72b34e..8320b18 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -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); diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 5dca8d7..4657e71 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -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