]> git.proxmox.com Git - qemu.git/commitdiff
mainstone: fix name of the allocated memory for roms
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Thu, 13 Jan 2011 15:37:10 +0000 (18:37 +0300)
committerAurelien Jarno <aurelien@aurel32.net>
Thu, 20 Jan 2011 11:37:21 +0000 (12:37 +0100)
Mainstone board has two flash chips (emulated by two ram regions), however
currently code tries to allocate them with the same name, which fails.
Fix that to make mainstone emulation work again.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
hw/mainstone.c

index efa2959c7272a89d076a2487c131ba93c38f9f2d..58e3f8670d5fad234cacfa5b682226032b06400a 100644 (file)
@@ -106,7 +106,8 @@ static void mainstone_common_init(ram_addr_t ram_size,
         }
 
         if (!pflash_cfi01_register(mainstone_flash_base[i],
-                                   qemu_ram_alloc(NULL, "mainstone.flash",
+                                   qemu_ram_alloc(NULL, i ? "mainstone.flash1" :
+                                                  "mainstone.flash0",
                                                   MAINSTONE_FLASH),
                                    dinfo->bdrv, sector_len,
                                    MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0,