Make exec-dm.c compile in the new world.

diff --git a/i386-dm/exec-dm.c b/i386-dm/exec-dm.c
index 2ebdebff040cf5a7b75308f21588ab38b38a31c8..7796ba54b1c945491d308dc923e886fb139d0a0d 100644 (file)
--- a/i386-dm/exec-dm.c
+++ b/i386-dm/exec-dm.c
@@ -34,7 +34,8 @@
 
 #include "cpu.h"
 #include "exec-all.h"
-#include "vl.h"
+#include "hw.h"
+#include "qemu-xen.h"
 
 //#define DEBUG_TB_INVALIDATE
 //#define DEBUG_FLUSH
@@ -64,8 +65,8 @@ uint8_t code_gen_buffer[CODE_GEN_BUFFER_SIZE];
 uint8_t *code_gen_ptr;
 #endif /* !CONFIG_DM */
 
-uint64_t phys_ram_size;
-extern uint64_t ram_size;
+ram_addr_t phys_ram_size;
+ram_addr_t ram_size;
 int phys_ram_fd;
 uint8_t *phys_ram_base;
 uint8_t *phys_ram_dirty;

diff --git a/xen-hooks.mak b/xen-hooks.mak
index f82a03d7f6b6652c6adb4020f1c85570af198610..8358054f5a3ec4f504ab85ac1a44c8cfc903f50f 100644 (file)
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -28,6 +28,7 @@ OBJS += xen_machine_pv.o
 OBJS += xen_console.o
 OBJS += xen_machine_fv.o
 OBJS += xen_blktap.o
+OBJS += exec-dm.o
 
 ifdef CONFIG_PASSTHROUGH
 OBJS+= pass-through.o