X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=xen-all.c;h=539a1549a5cee3b313dbb67dad636735a194e8a5;hb=913b4b6bf39c97bc503a629b43c66d3270b5f3f5;hp=110f958a5353a5c5d9013b76e122e8c512b5f072;hpb=58a864dec23f9052a5379a3ce81566e065c14afa;p=qemu.git

diff --git a/xen-all.c b/xen-all.c
index 110f958a5..539a1549a 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -11,12 +11,12 @@
 #include <sys/mman.h>
 
 #include "hw/pci/pci.h"
-#include "hw/pc.h"
-#include "hw/xen_common.h"
-#include "hw/xen_backend.h"
+#include "hw/i386/pc.h"
+#include "hw/xen/xen_common.h"
+#include "hw/xen/xen_backend.h"
 #include "qmp-commands.h"
 
-#include "char/char.h"
+#include "sysemu/char.h"
 #include "qemu/range.h"
 #include "sysemu/xen-mapcache.h"
 #include "trace.h"
@@ -578,16 +578,18 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
 
 static void xen_reset_vcpu(void *opaque)
 {
-    CPUArchState *env = opaque;
+    CPUState *cpu = opaque;
 
-    env->halted = 1;
+    cpu->halted = 1;
 }
 
 void xen_vcpu_init(void)
 {
     if (first_cpu != NULL) {
-        qemu_register_reset(xen_reset_vcpu, first_cpu);
-        xen_reset_vcpu(first_cpu);
+        CPUState *cpu = ENV_GET_CPU(first_cpu);
+
+        qemu_register_reset(xen_reset_vcpu, cpu);
+        xen_reset_vcpu(cpu);
     }
     /* if rtc_clock is left to default (host_clock), disable it */
     if (rtc_clock == host_clock) {