From 608911acac53f08dfaaf1878f56d4e32ee572ce4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Wed, 2 May 2012 18:49:27 +0200 Subject: [PATCH] pc: Use cpu_x86_init() to obtain X86CPU MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Needed for pc_cpu_reset(). Also change return type to X86CPU. Signed-off-by: Andreas Färber Reviewed-by: Igor Mammedov --- hw/pc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index c790bcbfd7..11339215a7 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -932,21 +932,23 @@ static void pc_cpu_reset(void *opaque) env->halted = !cpu_is_bsp(env); } -static CPUX86State *pc_new_cpu(const char *cpu_model) +static X86CPU *pc_new_cpu(const char *cpu_model) { + X86CPU *cpu; CPUX86State *env; - env = cpu_init(cpu_model); - if (!env) { + cpu = cpu_x86_init(cpu_model); + if (cpu == NULL) { fprintf(stderr, "Unable to find x86 CPU definition\n"); exit(1); } + env = &cpu->env; if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { env->apic_state = apic_init(env, env->cpuid_apic_id); } qemu_register_reset(pc_cpu_reset, env); pc_cpu_reset(env); - return env; + return cpu; } void pc_cpus_init(const char *cpu_model) -- 2.11.4.GIT