From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 29 Jul 2013 05:00:29 +0000 (+0200)
Subject: mips_malta: fix copy of the 0x1fc00000 region
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f05d4d94d6bb0e240e6cfda65972fd86601f9f0d;p=qemu.git

mips_malta: fix copy of the 0x1fc00000 region

Copy the whole 0x1fe000000 region into 0x1fc00000, independently of the
loaded BIOS size. This fix the MIPS make check tests.

Reported-by: Andreas Färber <afaerber@suse.de>
Tested-by: Andreas Färber <afaerber@suse.de>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 2dc66f7748..1589b59194 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1036,9 +1036,9 @@ void mips_malta_init(QEMUMachineInitArgs *args)
      */
     memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE);
     if (!rom_copy(memory_region_get_ram_ptr(bios_copy),
-                  FLASH_ADDRESS, bios_size)) {
+                  FLASH_ADDRESS, BIOS_SIZE)) {
         memcpy(memory_region_get_ram_ptr(bios_copy),
-               memory_region_get_ram_ptr(bios), bios_size);
+               memory_region_get_ram_ptr(bios), BIOS_SIZE);
     }
     memory_region_set_readonly(bios_copy, true);
     memory_region_add_subregion(system_memory, RESET_ADDRESS, bios_copy);