From: Andreas Färber <afaerber@suse.de>
Date: Tue, 22 May 2012 23:51:57 +0000 (+0200)
Subject: xen_machine_pv: Use cpu_x86_init() to obtain X86CPU
X-Git-Tag: qemu-xen-4.3.0-rc1~1009^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a0595d9eb85c64e00d03c4d696bb1028e99dfcbc;p=qemu-upstream-4.3-testing.git

xen_machine_pv: Use cpu_x86_init() to obtain X86CPU

Needed for moving halted field to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Tested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 7eee770ee..4b72aa755 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -36,6 +36,7 @@ static void xen_init_pv(ram_addr_t ram_size,
 			const char *initrd_filename,
 			const char *cpu_model)
 {
+    X86CPU *cpu;
     CPUX86State *env;
     DriveInfo *dinfo;
     int i;
@@ -48,7 +49,8 @@ static void xen_init_pv(ram_addr_t ram_size,
         cpu_model = "qemu32";
 #endif
     }
-    env = cpu_init(cpu_model);
+    cpu = cpu_x86_init(cpu_model);
+    env = &cpu->env;
     env->halted = 1;
 
     /* Initialize backend core & drivers */