[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V9 13/20] pc: split out cpu initialization from pc_i
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V9 13/20] pc: split out cpu initialization from pc_init1() into pc_cpus_init(). |
Date: |
Tue, 8 Dec 2009 17:33:32 +0900 |
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 <address@hidden>
---
hw/pc.c | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index d0ef06b..6c5fc9d 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -982,6 +982,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);
@@ -1005,7 +1023,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;
@@ -1026,18 +1043,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.5.4
- [Qemu-devel] [PATCH V9 07/20] pc, i440fx: Make smm enable/disable function i440fx independent., (continued)
- [Qemu-devel] [PATCH V9 07/20] pc, i440fx: Make smm enable/disable function i440fx independent., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 19/20] pc: move rtc declarations from pc.h into a dedicated header file., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 02/20] acpi: split out apm register emulation from acpi.c, Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 08/20] pc: make an unnecessary global variable, pit, local., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 18/20] pc: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 09/20] pc: remove a global variable, floppy_controller., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 11/20] pc: introduce a function to allocate cpu irq., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 14/20] pc: split out memory allocation from pc_init1() into pc_memory_init(), Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 06/20] pc: initialize ioapic before use., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 05/20] acpi_piix4: remove unused variable in get_pmsts()., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 13/20] pc: split out cpu initialization from pc_init1() into pc_cpus_init().,
Isaku Yamahata <=
- [Qemu-devel] [PATCH V9 20/20] rtc: make rtc_xxx accept/return ISADevice instead of RTCState., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 16/20] pc: split out basic device init from pc_init1() into pc_basic_device_init(), Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 04/20] acpi: split acpi.c into the common part and the piix4 part., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 01/20] acpi: split out pc smbus routines from acpi.c into pc_smbus.c, Isaku Yamahata, 2009/12/08