xen: arm: fix build after libelf changes

Enterprise / Virtualization / Xen - Ian Campbell [citrix.com] - 16 June 2013 14:22 EDT

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).

###

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 *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");

b03165b xen: arm: fix build after libelf changes.
xen/arch/arm/kernel.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Upstream: xenbits.xen.org


  • Share