[Xen-changelog] [xen-unstable] Use address types in elf parser that match elf headers.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID d49e5cc672ebf3d661adcc72d277c2d317812bf1
# Parent  4260eb8c08740de0000081c61a6237ffcb95b2d5
Use address types in elf parser that match elf headers.
Necessary if a long is a different size to addresses in elf
file being parsed.
From: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/libxc/xc_load_elf.c |    2 +-
 xen/common/elf.c          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r 4260eb8c0874 -r d49e5cc672eb tools/libxc/xc_load_elf.c
--- a/tools/libxc/xc_load_elf.c Wed Jun 28 18:17:41 2006 +0100
+++ b/tools/libxc/xc_load_elf.c Wed Jun 28 20:46:01 2006 +0100
@@ -68,7 +68,7 @@ static int parseelfimage(const char *ima
     Elf_Ehdr *ehdr = (Elf_Ehdr *)image;
     Elf_Phdr *phdr;
     Elf_Shdr *shdr;
-    unsigned long kernstart = ~0UL, kernend=0UL, vaddr, virt_base, elf_pa_off;
+    Elf_Addr kernstart = ~0, kernend = 0, vaddr, virt_base, elf_pa_off;
     const char *shstrtab;
     char *guestinfo=NULL, *p;
     int h, virt_base_defined, elf_pa_off_defined;
diff -r 4260eb8c0874 -r d49e5cc672eb xen/common/elf.c
--- a/xen/common/elf.c  Wed Jun 28 18:17:41 2006 +0100
+++ b/xen/common/elf.c  Wed Jun 28 20:46:01 2006 +0100
@@ -23,7 +23,7 @@ int parseelfimage(struct domain_setup_in
     Elf_Ehdr *ehdr = (Elf_Ehdr *)dsi->image_addr;
     Elf_Phdr *phdr;
     Elf_Shdr *shdr;
-    unsigned long kernstart = ~0UL, kernend=0UL, vaddr, virt_base, elf_pa_off;
+    Elf_Addr kernstart = ~0, kernend = 0, vaddr, virt_base, elf_pa_off;
     char *shstrtab, *guestinfo=NULL, *p;
     char *elfbase = (char *)dsi->image_addr;
     int h, virt_base_defined, elf_pa_off_defined;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog