From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 6 Jun 2008 16:48:14 +0000 (+0100)
Subject: Need to compile some of loader.c too
X-Git-Tag: xen-3.3.0-rc1~92
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3d23adbac1e37dd837ef9ea0311e3f89e625ca35;p=qemu-xen-4.4-testing.git

Need to compile some of loader.c too
---

diff --git a/loader.c b/loader.c
index 29a01d704..173cea118 100644
--- a/loader.c
+++ b/loader.c
@@ -100,6 +100,8 @@ int read_targphys(int fd, target_phys_addr_t dst_addr, size_t nbytes)
     return dst_addr - dst_begin;
 }
 
+#ifndef CONFIG_DM
+
 /* return the size or -1 if error */
 int load_image_targphys(const char *filename,
 			target_phys_addr_t addr, int max_sz)
@@ -390,3 +392,5 @@ fail:
     close(fd);
     return -1;
 }
+
+#endif /*CONFIG_DM*/
diff --git a/xen-hooks.mak b/xen-hooks.mak
index f058ff1b8..94c031e48 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -34,7 +34,7 @@ ifdef CONFIG_PASSTHROUGH
 OBJS+= pass-through.o
 endif
 
-BAD_OBJS += loader.o gdbstub.o acpi.o apic.o
+BAD_OBJS += gdbstub.o acpi.o apic.o
 BAD_OBJS += vmmouse.o vmport.o tcg* helper.o
 
 OBJS := $(filter-out $(BAD_OBJS), $(OBJS))