[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/5] split pc_new_cpu
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH v2 1/5] split pc_new_cpu |
Date: |
Fri, 17 Apr 2009 17:00:04 -0400 |
since it is useful elsewhere.
Signed-off-by: Glauber Costa <address@hidden>
---
hw/pc.c | 37 ++++++++++++++++++++++---------------
hw/pc.h | 1 +
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 6a1750e..39ed066 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -775,6 +775,26 @@ static int load_option_rom(const char *oprom,
target_phys_addr_t start,
return size;
}
+CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled)
+{
+ CPUState *env = cpu_init(cpu_model);
+ if (!env) {
+ fprintf(stderr, "Unable to find x86 CPU definition\n");
+ exit(1);
+ }
+ if (cpu != 0)
+ env->halted = 1;
+ if (smp_cpus > 1) {
+ /* XXX: enable it in all cases */
+ env->cpuid_features |= CPUID_APIC;
+ }
+ qemu_register_reset(main_cpu_reset, env);
+ if (pci_enabled) {
+ apic_init(env);
+ }
+ return env;
+}
+
/* PC hardware initialisation */
static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
const char *boot_device,
@@ -816,23 +836,10 @@ static void pc_init1(ram_addr_t ram_size, int
vga_ram_size,
}
for(i = 0; i < smp_cpus; i++) {
- env = cpu_init(cpu_model);
- if (!env) {
- fprintf(stderr, "Unable to find x86 CPU definition\n");
- exit(1);
- }
- if (i != 0)
- env->halted = 1;
- if (smp_cpus > 1) {
- /* XXX: enable it in all cases */
- env->cpuid_features |= CPUID_APIC;
- }
- qemu_register_reset(main_cpu_reset, env);
- if (pci_enabled) {
- apic_init(env);
- }
+ env = pc_new_cpu(i, cpu_model, pci_enabled);
}
+
vmport_init();
/* allocate RAM */
diff --git a/hw/pc.h b/hw/pc.h
index 50e6c39..59047b5 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -102,6 +102,7 @@ extern int fd_bootchk;
void ioport_set_a20(int enable);
int ioport_get_a20(void);
+CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled);
/* acpi.c */
extern int acpi_enabled;
--
1.5.6.6