[Qemu-devel] [PATCH] Always load PowerPC kernel to KERNEL_LOAD_ADDR

[Alexander Graf <agraf@suse.de>]

Linux changed its physical address location in the elf header from
0xc0000000 to 0 on 2.6.25, causing later kernels to fail booting
with the -kernel option.

This patch assures that the lowest segment in the elf binary is loaded
to KERNEL_LOAD_ADDR, which is where the firmware expects it.

With this patch applied, I was able to successfully boot a 2.6.18 and
a 2.6.27 Linux kernel using the -kernel option.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/ppc_oldworld.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 042a40f..f64884b 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -207,9 +207,11 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
     }
 
     if (linux_boot) {
+        uint64_t lowaddr = 0;
         kernel_base = KERNEL_LOAD_ADDR;
         /* now we can load the kernel */
-        kernel_size = load_elf(kernel_filename, kernel_base - 0xc0000000ULL,
+        load_elf(kernel_filename, 0, NULL, &lowaddr, NULL);
+        kernel_size = load_elf(kernel_filename, kernel_base - lowaddr,
                                NULL, NULL, NULL);
         if (kernel_size < 0)
             kernel_size = load_aout(kernel_filename, kernel_base,
-- 
1.6.0.2