[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] xen: arm: fix build after libelf changes.

commit b03165b4edf7fe2a441844e11bd2cba0653281f9
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Sat Jun 15 09:30:47 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Sun Jun 16 20:22:09 2013 +0100

    xen: arm: fix build after libelf changes.
    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 
    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@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
 xen/arch/arm/kernel.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
index 43cf2ab..aba5441 100644
--- a/xen/arch/arm/kernel.c
+++ b/xen/arch/arm/kernel.c
@@ -159,7 +159,9 @@ static int kernel_try_zimage_prepare(struct kernel_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 
+    info->elf.elf.dest_size =
+         info->elf.parms.virt_kend - info->elf.parms.virt_kstart;
     printk("Free temporary kernel buffer\n");
generated by git-patchbot for /home/xen/git/xen.git#master

Xen-changelog mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.