From patchwork Wed Sep 3 09:06:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 385453 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 CC4CD140218 for ; Wed, 3 Sep 2014 19:26:28 +1000 (EST) Received: from localhost ([::1]:43428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP6pe-0000l4-LR for incoming@patchwork.ozlabs.org; Wed, 03 Sep 2014 05:26:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP6pB-0008WS-6D for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:26:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XP6p5-0004uJ-9q for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:25:57 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:44880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP6p4-0004ty-QI for qemu-devel@nongnu.org; Wed, 03 Sep 2014 05:25:51 -0400 Received: from kw-mxauth.gw.nic.fujitsu.com (unknown [10.0.237.134]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 210203EE0C3 for ; Wed, 3 Sep 2014 18:25:50 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by kw-mxauth.gw.nic.fujitsu.com (Postfix) with ESMTP id 24C90AC06ED for ; Wed, 3 Sep 2014 18:25:49 +0900 (JST) Received: from s00.gw.fujitsu.co.jp (s00.gw.nic.fujitsu.com [133.161.11.15]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id C6CBF1DB803E for ; Wed, 3 Sep 2014 18:25:48 +0900 (JST) Received: from s00.gw.fujitsu.co.jp (kw-mxio2.gw.nic.fujitsu.com [10.0.237.142]) by s00.gw.fujitsu.co.jp (Postfix) with ESMTP id A54E11180B8; Wed, 3 Sep 2014 18:25:48 +0900 (JST) Received: from guz (unknown [10.167.226.100]) by s00.gw.fujitsu.co.jp (Postfix) with ESMTP id 6F28B8A003; Wed, 3 Sep 2014 18:25:48 +0900 (JST) Received: (from root@localhost) by guz (8.14.5/8.14.5/Submit) id s839AVOA029403; Wed, 3 Sep 2014 17:10:31 +0800 From: Gu Zheng To: qemu-devel@nongnu.org Date: Wed, 3 Sep 2014 17:06:15 +0800 Message-Id: <1409735177-17232-4-git-send-email-guz.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1409735177-17232-1-git-send-email-guz.fnst@cn.fujitsu.com> References: <1409735177-17232-1-git-send-email-guz.fnst@cn.fujitsu.com> X-TM-AS-MML: disable X-TMASE-MatchedRID: lYUFo9LzIpnapj0/CUXauAPZZctd3P4BO69hrW/YgWEKogmGusPLb+gY WcI4QZwH8PvvQfzgClpmnnGPjbi+SK0ZS7JYIH8q4bl1FkKDELfKSSY85EbkdT3arh8c4heaAn3 fycoU96AmROQ/eSO/iIAy6p60ZV62Mhe627A+8aHdB/CxWTRRu25FeHtsUoHum14xhKMJ2NS4un QX7yc46qvwdV51rlsYFTrmuiGq9FJYKVgm72vjJg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 192.51.44.36 Cc: tangchen@cn.fujitsu.com, Gu Zheng , isimatu.yasuaki@jp.fujitsu.com, chen.fan.fnst@cn.fujitsu.com, imammedo@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 3/5] acpi:piix4: convert cpu hotplug handle 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 handle to hotplug_handler API. Signed-off-by: Gu Zheng --- hw/acpi/piix4.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index b72b34e..6209385 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); } 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);