[Qemu-devel] [6131] Fix kernel loading

[Blue Swirl]

Revision: 6131
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6131
Author:   blueswir1
Date:     2008-12-24 20:30:01 +0000 (Wed, 24 Dec 2008)

Log Message:
-----------
Fix kernel loading

Modified Paths:
--------------
    trunk/hw/ppc_oldworld.c

Modified: trunk/hw/ppc_oldworld.c
===================================================================
--- trunk/hw/ppc_oldworld.c     2008-12-24 20:29:16 UTC (rev 6130)
+++ trunk/hw/ppc_oldworld.c     2008-12-24 20:30:01 UTC (rev 6131)
@@ -207,7 +207,15 @@
     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);