From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 6 Jun 2008 15:16:43 +0000 (+0100)
Subject: Make exec-dm.c compile in the new world.
X-Git-Tag: xen-3.3.0-rc1~101
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0a92ef9ce202952c7793a96ab14836a3208f0692;p=qemu-xen-4.6-testing.git

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

diff --git a/i386-dm/exec-dm.c b/i386-dm/exec-dm.c
index 2ebdebff0..7796ba54b 100644
--- 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 f82a03d7f..8358054f5 100644
--- 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