diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-06-15 09:30:47 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-06-16 20:22:09 +0100 |
| commit | b03165b4edf7fe2a441844e11bd2cba0653281f9 (patch) | |
| tree | 0827fd7ccfde29f3ec231cfa22bc87dc6d4d3b0f | |
| parent | 82cb4113b6ace16de192021de20f6cbd991e478f (diff) | |
| download | xen-b03165b4edf7fe2a441844e11bd2cba0653281f9.tar.gz xen-b03165b4edf7fe2a441844e11bd2cba0653281f9.tar.bz2 xen-b03165b4edf7fe2a441844e11bd2cba0653281f9.zip | |
xen: arm: fix build after libelf changes.4.3.0-rc5
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>
| -rw-r--r-- | 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 43cf2abc2a..aba5441066 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 *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"); |