From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 2 Jul 2005 15:11:25 +0000 (+0000)
Subject: kernel load fix (Ralf Baechle)
X-Git-Tag: release_0_7_1~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de12d6369bec323e9198c85b9cd60e52812442ba;p=thirdparty%2Fqemu.git

kernel load fix (Ralf Baechle)


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

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 1b6a8016761..528ff2b8df5 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -257,8 +257,9 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     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);
-        if (kernel_size < 0) {
+        kernel_size = load_image(kernel_filename,
+                                phys_ram_base + (kernel_base - 0x80000000));
+        if (kernel_size == (target_ulong) -1) {
             fprintf(stderr, "qemu: could not load kernel '%s'\n", 
                     kernel_filename);
             exit(1);
@@ -268,7 +269,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
             initrd_base = INITRD_LOAD_ADDR;
             initrd_size = load_image(initrd_filename,
                                      phys_ram_base + initrd_base);
-            if (initrd_size < 0) {
+            if (initrd_size == (target_ulong) -1) {
                 fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", 
                         initrd_filename);
                 exit(1);