]> xenbits.xensource.com Git - qemu-xen-4.0-testing.git/commitdiff
Compile pstrcpy_targphys on CONFIG_DM too
authorIan Jackson <ian.jackson@eu.citrix.com>
Mon, 16 Mar 2009 16:51:21 +0000 (16:51 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 16 Mar 2009 16:51:21 +0000 (16:51 +0000)
This was accidentally turned off during the merge.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
loader.c

index de5c6230e1ba2b42422fc9758815842f11d57acb..519da52128ff88a289bcad4e7cfbb8bb8042cedd 100644 (file)
--- a/loader.c
+++ b/loader.c
@@ -124,8 +124,6 @@ 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)
@@ -160,6 +158,8 @@ void pstrcpy_targphys(target_phys_addr_t dest, int buf_size,
     }
 }
 
+#ifndef CONFIG_DM
+
 /* A.OUT loader */
 
 struct exec