From patchwork Wed Oct 22 03:24:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 401871 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 18261140080 for ; Wed, 22 Oct 2014 14:44:08 +1100 (AEDT) Received: from localhost ([::1]:54620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgmqE-0005F5-9B for incoming@patchwork.ozlabs.org; Tue, 21 Oct 2014 23:44:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgmpq-0004pn-5N for qemu-devel@nongnu.org; Tue, 21 Oct 2014 23:43:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xgmpk-0008Nt-88 for qemu-devel@nongnu.org; Tue, 21 Oct 2014 23:43:42 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:34848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgmpj-0008Nj-Pc for qemu-devel@nongnu.org; Tue, 21 Oct 2014 23:43:36 -0400 Received: from kw-mxauth.gw.nic.fujitsu.com (unknown [10.0.237.134]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 0C9763EE0AE for ; Wed, 22 Oct 2014 12:43:35 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by kw-mxauth.gw.nic.fujitsu.com (Postfix) with ESMTP id 0EE0BAC048D for ; Wed, 22 Oct 2014 12:43:34 +0900 (JST) Received: from s01.gw.fujitsu.co.jp (s01.gw.nic.fujitsu.com [133.161.11.16]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id B40CE1DB8043 for ; Wed, 22 Oct 2014 12:43:33 +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 7CB1B3F0028; Wed, 22 Oct 2014 12:43:33 +0900 (JST) Received: from guz (unknown [10.167.226.100]) by s01.gw.fujitsu.co.jp (Postfix) with ESMTP id 1C4B88A002; Wed, 22 Oct 2014 12:43:33 +0900 (JST) Received: (from root@localhost) by guz (8.14.5/8.14.5/Submit) id s9M3QlIn007854; Wed, 22 Oct 2014 11:26:47 +0800 From: Gu Zheng To: imammedo@redhat.com, qemu-devel@nongnu.org Date: Wed, 22 Oct 2014 11:24:25 +0800 Message-Id: <1413948272-7765-2-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: disable X-TMASE-MatchedRID: yvDAzrttxFU1vivz3L6ga2NW0DAjL5p+KWPnYJ5Ay2rCLmxD0pDZyWA2 fv3y4alqkZ3T6ylBNAUBtjkcfRMmqWPlX7LITICti/b+LxU2p45n+sA9+u1YLZ0Koq3EzpuHJO/ a0FBEDxqugpIE2nzunoAy6p60ZV62fJ5/bZ6npdiyO81X3yak8+RN46UsZJcyM8bz7oPnAb1O9M ArL3q5v4XTzhw4pPVd/Y+L/IYQzgx+3BndfXUhXQ== 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 1/8] acpi/cpu: add cpu hotplug callback function to match 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 Add cpu hotplug callback function (acpi_cpu_plug_cb) to match hotplug_handler API. Reviewed-by: Igor Mammedov Signed-off-by: Gu Zheng --- v4: -convert CPUState *cpu to DeviceState *dev like it's done for other handlers and do cast to CPU inside. v2: -add errp argument to catch error. -return error instead of aborting if cpu id is invalid. -make acpi_cpu_plug_cb as a wrapper around AcpiCpuHotplug_add. hw/acpi/cpu_hotplug.c | 18 ++++++++++++++++++ include/hw/acpi/cpu_hotplug.h | 3 +++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 2ad83a0..06e9c61 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -36,6 +36,24 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = { }, }; +void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq, + AcpiCpuHotplug *g, DeviceState *dev, Error **errp) +{ + CPUState *cpu = CPU(dev); + CPUClass *k = CPU_GET_CLASS(cpu); + int64_t cpu_id; + + cpu_id = k->get_arch_id(cpu); + if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) { + error_setg(errp, "acpi: invalid cpu id: %" PRIi64, cpu_id); + return; + } + + AcpiCpuHotplug_add(&ar->gpe, g, cpu); + + acpi_update_sci(ar, irq); +} + void AcpiCpuHotplug_add(ACPIGPE *gpe, AcpiCpuHotplug *g, CPUState *cpu) { CPUClass *k = CPU_GET_CLASS(cpu); diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 9e5d30c..5dca8d7 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -20,6 +20,9 @@ typedef struct AcpiCpuHotplug { uint8_t sts[ACPI_GPE_PROC_LEN]; } 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,