From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 24 Dec 2008 20:30:01 +0000 (+0000)
Subject: Fix kernel loading
X-Git-Tag: xen-3.4.0-rc2~71^2^2~203
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=52f163b7f4ca67371c15d17bb55b0a9d19d6700c;p=qemu-xen-4.1-testing.git

Fix kernel loading

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6131 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 5bf52eeb4..9318be4d1 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -207,7 +207,15 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
     if (linux_boot) {
         kernel_base = KERNEL_LOAD_ADDR;
         /* now we can load the kernel */
-        kernel_size = load_image(kernel_filename, phys_ram_base + kernel_base);
+        kernel_size = load_elf(kernel_filename, kernel_base - 0xc0000000ULL,
+                               NULL, NULL, NULL);
+        if (kernel_size < 0)
+            kernel_size = load_aout(kernel_filename, kernel_base,
+                                    ram_size - kernel_base);
+        if (kernel_size < 0)
+            kernel_size = load_image_targphys(kernel_filename,
+                                              kernel_base,
+                                              ram_size - kernel_base);
         if (kernel_size < 0) {
             cpu_abort(env, "qemu: could not load kernel '%s'\n",
                       kernel_filename);