]> xenbits.xensource.com Git - xen.git/commitdiff
xen: arm: fix build after libelf changes. 4.3.0-rc5
authorIan Campbell <ian.campbell@citrix.com>
Sat, 15 Jun 2013 08:30:47 +0000 (09:30 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Sun, 16 Jun 2013 19:22:09 +0000 (20:22 +0100)
ed65808a8ed4 "libelf: check all pointer accesses" caused:
    kernel.c: In function 'kernel_elf_load':
    kernel.c:162:18: error: 'struct elf_binary' has no member named 'dest'
    make[4]: *** [kernel.o] Error 1

The field is now called dest_base. We also need to populate dest_size.

This fixes the build for me although have not tested it. I have a feeling that
loading the kernel from an ELF file on ARM doesn't currently work anyway
(everyone uses the zImage loader as far as I am aware).

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
xen/arch/arm/kernel.c

index 43cf2abc2a65cdb60bb8a002d7bae51a8f44cee6..aba5441066fafaad4873a7d387b3827705062a13 100644 (file)
@@ -159,7 +159,9 @@ static int kernel_try_zimage_prepare(struct kernel_info *info,
 static void kernel_elf_load(struct kernel_info *info)
 {
     printk("Loading ELF image into guest memory\n");
-    info->elf.elf.dest = (void*)(unsigned long)info->elf.parms.virt_kstart;
+    info->elf.elf.dest_base = (void*)(unsigned long)info->elf.parms.virt_kstart;
+    info->elf.elf.dest_size =
+         info->elf.parms.virt_kend - info->elf.parms.virt_kstart;
     elf_load_binary(&info->elf.elf);
 
     printk("Free temporary kernel buffer\n");