From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 23 Mar 2009 16:39:29 +0000 (+0000)
Subject: Fixup dummy cpu setup.
X-Git-Tag: xen-3.4.0-rc2~44
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cf494ee581a80f0b5346f1e9afcd95f6d3a12ef6;p=qemu-xen-3.4-testing.git

Fixup dummy cpu setup.

Passing NULL to cpu_init() doesn't work in upstream qemu.
Also make sure the dummy cpu is in halted mode.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 624d8dd2..df28be9b 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -51,7 +51,15 @@ static void xen_init_pv(ram_addr_t ram_size, int vga_ram_size,
 #endif
 
     /* Initialize a dummy CPU */
-    env = cpu_init(NULL);
+    if (cpu_model == NULL) {
+#ifdef TARGET_X86_64
+        cpu_model = "qemu64";
+#else
+        cpu_model = "qemu32";
+#endif
+    }
+    env = cpu_init(cpu_model);
+    env->halted = 1;
 
     /* Initialize backend core & drivers */
     if (-1 == xen_be_init()) {