[Qemu-devel] [4452] Fix loading of binary ROMs

[Blue Swirl]

Revision: 4452
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4452
Author:   blueswir1
Date:     2008-05-13 15:44:10 +0000 (Tue, 13 May 2008)

Log Message:
-----------
Fix loading of binary ROMs

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

Modified: trunk/hw/sun4m.c
===================================================================
--- trunk/hw/sun4m.c    2008-05-13 14:35:34 UTC (rev 4451)
+++ trunk/hw/sun4m.c    2008-05-13 15:44:10 UTC (rev 4452)
@@ -435,7 +435,7 @@
     snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
     ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL);
     if (ret < 0 || ret > PROM_SIZE_MAX)
-        ret = load_image_targphys(buf, prom_offset, PROM_SIZE_MAX);
+        ret = load_image_targphys(buf, hwdef->slavio_base, PROM_SIZE_MAX);
     if (ret < 0 || ret > PROM_SIZE_MAX) {
         fprintf(stderr, "qemu: could not load prom '%s'\n",
                 buf);
@@ -605,7 +605,7 @@
     snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
     ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL);
     if (ret < 0 || ret > PROM_SIZE_MAX)
-        ret = load_image_targphys(buf, prom_offset, PROM_SIZE_MAX);
+        ret = load_image_targphys(buf, hwdef->slavio_base, PROM_SIZE_MAX);
     if (ret < 0 || ret > PROM_SIZE_MAX) {
         fprintf(stderr, "qemu: could not load prom '%s'\n",
                 buf);
@@ -1421,7 +1421,7 @@
     snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
     ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL);
     if (ret < 0 || ret > PROM_SIZE_MAX)
-        ret = load_image_targphys(buf, prom_offset, PROM_SIZE_MAX);
+        ret = load_image_targphys(buf, hwdef->slavio_base, PROM_SIZE_MAX);
     if (ret < 0 || ret > PROM_SIZE_MAX) {
         fprintf(stderr, "qemu: could not load prom '%s'\n",
                 buf);