From patchwork Wed Jan 6 02:39:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 42267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 015ABB6EEF for ; Wed, 6 Jan 2010 14:21:02 +1100 (EST) Received: from localhost ([127.0.0.1]:43104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSMSA-0001E8-Ss for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 22:20:58 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSLoi-0004R0-3t for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:40:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSLoW-0004Jx-AB for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:40:08 -0500 Received: from [199.232.76.173] (port=54798 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSLoV-0004JY-Ep for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:39:59 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:60930) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSLoT-0003kv-Q4 for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:39:59 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id DFCB8182A8; Wed, 6 Jan 2010 11:39:46 +0900 (JST) Received: (nullmailer pid 28752 invoked by uid 1000); Wed, 06 Jan 2010 02:39:51 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com, aurelien@aurel32.net Date: Wed, 6 Jan 2010 11:39:37 +0900 Message-Id: <1262745591-28697-14-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1262745591-28697-1-git-send-email-yamahata@valinux.co.jp> References: <1262745591-28697-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V12 13/27] pc: split out cpu initialization from pc_init1() into pc_cpus_init(). X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org split out cpu initialization which is piix independent from pc_init1() into pc_cpus_init(). Later it will be used. Signed-off-by: Isaku Yamahata Acked-by: Gerd Hoffmann --- hw/pc.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 1a13b0f..90cf0f4 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -993,6 +993,24 @@ static CPUState *pc_new_cpu(const char *cpu_model) return env; } +static void pc_cpus_init(const char *cpu_model) +{ + int i; + + /* init CPUs */ + if (cpu_model == NULL) { +#ifdef TARGET_X86_64 + cpu_model = "qemu64"; +#else + cpu_model = "qemu32"; +#endif + } + + for(i = 0; i < smp_cpus; i++) { + (void)pc_new_cpu(cpu_model); + } +} + static qemu_irq *pc_allocate_cpu_irq(void) { return qemu_allocate_irqs(pic_irq_request, NULL, 1); @@ -1016,7 +1034,6 @@ static void pc_init1(ram_addr_t ram_size, ISADevice *isa_dev; PCII440FXState *i440fx_state; int piix3_devfn = -1; - CPUState *env; qemu_irq *cpu_irq; qemu_irq *isa_irq; qemu_irq *i8259; @@ -1037,18 +1054,7 @@ static void pc_init1(ram_addr_t ram_size, linux_boot = (kernel_filename != NULL); - /* init CPUs */ - if (cpu_model == NULL) { -#ifdef TARGET_X86_64 - cpu_model = "qemu64"; -#else - cpu_model = "qemu32"; -#endif - } - - for (i = 0; i < smp_cpus; i++) { - env = pc_new_cpu(cpu_model); - } + pc_cpus_init(cpu_model); vmport_init();