]> xenbits.xensource.com Git - qemu-xen-4.3-testing.git/commitdiff
Need to compile some of loader.c too
authorIan Jackson <iwj@mariner.uk.xensource.com>
Fri, 6 Jun 2008 16:48:14 +0000 (17:48 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 6 Jun 2008 16:48:14 +0000 (17:48 +0100)
loader.c
xen-hooks.mak

index 29a01d704d9a9ba24e70c19440925c22352f996b..173cea118bc81dc008e317286e16aaa54886e6ec 100644 (file)
--- 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*/
index f058ff1b8ccce538cc0498d4222b2a3bf2ddbc4c..94c031e48f8a007f7f49c165215b66fd4696ad60 100644 (file)
@@ -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))