From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MsweB-00032d-Dy for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mswe5-0002yL-NW for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:58 -0400 Received: from [199.232.76.173] (port=41726 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mswe4-0002xy-FI for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:52 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:55571) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mswe3-0000JF-4C for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:51 -0400 From: Isaku Yamahata Date: Wed, 30 Sep 2009 19:17:49 +0900 Message-Id: <1254305917-14784-14-git-send-email-yamahata@valinux.co.jp> In-Reply-To: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> References: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] [PATCH 13/61] pc: split out cpu initialization from pc_init1() into pc_cpus_init(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, anthony@codemonkey.ws Cc: yamahata@valinux.co.jp 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 --- hw/pc.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index a5e97ac..10847ae 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1125,6 +1125,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); @@ -1148,7 +1166,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; @@ -1171,18 +1188,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(); -- 1.6.0.2