bug fixs for memory backend
v4 cover bug fixs for memory backend
This series includes:
1. two patches to fix bugs of memory backend. See patch 1-2.
2. Add errp to memory_region_init_ram and memory_region_init_ram_ptr, and add corresponding nofail versions. See patch 3-4.
changes to v3:
- fix build on 32bit host
- add memory API renaming
- rebase on latest master
Hu Tao (6):
memory: add memory_region_init_ram_may_fail() and
memory_region_init_ram_ptr_may_fail()
exec: improve error handling and reporting in file_ram_alloc() and
gethugepagesize()
rename memory_region_init_ram to memory_region_init_ram_nofail rename memory_region_init_ram_may_fail to memory_region_init_ram rename memory_region_init_ram_ptr to memory_region_init_ram_ptr_nofail rename memory_region_init_ram_ptr_may_fail to
memory_region_init_ram_ptr
backends/hostmem-ram.c | 2 +- exec.c | 53 ++++++++++++++++++++----------- hw/alpha/typhoon.c | 2 +- hw/arm/armv7m.c | 6 ++-- hw/arm/cubieboard.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 9 +++--- hw/arm/highbank.c | 4 +-- hw/arm/integratorcp.c | 5 +-- hw/arm/kzm.c | 4 +-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 5 +-- hw/arm/omap1.c | 6 ++-- hw/arm/omap2.c | 4 +-- hw/arm/omap_sx1.c | 5 +-- hw/arm/palm.c | 2 +- hw/arm/pxa2xx.c | 9 +++--- hw/arm/realview.c | 7 +++-- hw/arm/spitz.c | 2 +- hw/arm/strongarm.c | 3 +- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 3 +- hw/arm/vexpress.c | 10 +++--- hw/arm/virt.c | 3 +- hw/arm/xilinx_zynq.c | 4 +-- hw/block/onenand.c | 2 +- hw/core/loader.c | 2 +- hw/cris/axis_dev88.c | 5 +-- hw/display/cg3.c | 5 +-- hw/display/g364fb.c | 4 +-- hw/display/qxl.c | 6 ++-- hw/display/sm501.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 5 +-- hw/display/vga.c | 2 +- hw/display/vmware_vga.c | 3 +- hw/i386/kvm/pci-assign.c | 5 +-- hw/i386/pc.c | 2 +- hw/i386/pc_sysfw.c | 4 +-- hw/input/milkymist-softusb.c | 4 +-- hw/lm32/lm32_boards.c | 5 +-- hw/lm32/milkymist.c | 3 +- hw/m68k/an5206.c | 4 +-- hw/m68k/dummy_m68k.c | 2 +- hw/m68k/mcf5208.c | 4 +-- hw/microblaze/petalogix_ml605_mmu.c | 7 +++-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 5 +-- hw/mips/mips_fulong2e.c | 4 +-- hw/mips/mips_jazz.c | 7 +++-- hw/mips/mips_malta.c | 4 +-- hw/mips/mips_mipssim.c | 4 +-- hw/mips/mips_r4k.c | 4 +-- hw/misc/ivshmem.c | 9 +++--- hw/misc/vfio.c | 3 +- hw/moxie/moxiesim.c | 4 +-- hw/net/milkymist-minimac2.c | 4 +-- hw/openrisc/openrisc_sim.c | 2 +- hw/pci-host/prep.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 7 +++-- hw/ppc/ppc405_uc.c | 2 +- hw/ppc/spapr.c | 4 +-- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/shix.c | 6 ++-- hw/sparc/leon3.c | 4 +-- hw/sparc/sun4m.c | 9 +++--- hw/sparc64/sun4u.c | 5 +-- hw/unicore32/puv3.c | 2 +- hw/xtensa/sim.c | 4 +-- hw/xtensa/xtfpga.c | 6 ++-- include/exec/memory.h | 48 ++++++++++++++++++++++++---- include/exec/ram_addr.h | 4 +-- memory.c | 54 +++++++++++++++++++++++++++++--- numa.c | 4 +-- xen-hvm.c | 2 +- 79 files changed, 291 insertions(+), 168 deletions(-)
Signature · 1 line
1.9.3
PATCH v4 1/6 memory: add memory_region_init_ram_may_fail() and memory_region_init_ram_ptr_may_fail()
These two are almost the same as memory_region_init_ram() and memory_region_init_ram_ptr() except that they have an extra errp parameter to let callers handle error. The purpose is to fix the bug described below.
We should have added errp directly to memory_region_ram(), but that mixes updates to calls to memory_region_ram() and this bug fix and make it hard to review.
We will rename _may_fail variants later so that we will have two versions of API: one with errp parameter(memory_region_init_ram(), memory_region_init_ram_ptr()), one without errp parameter and with suffix _nofail.
In hostmem-ram.c we call memory_region_init_ram_may_fail() now rather than memory_region_init_ram() so that error can be handled. This solves a problem that qemu just exits when using monitor command object_add to add a memory backend whose size is way too large. In the case we'd better give an error message and keep guest running.
The problem can be reproduced as follows:
1. run qemu
2. (monitor)object_add memory-backend-ram,size=100000G,id=ram0
Signed-off-by Hu Tao <[email protected]>
--- backends/hostmem-ram.c | 4 +-- exec.c | 32 +++++++++++++++++------- include/exec/memory.h | 37 +++++++++++++++++++++++++++ include/exec/ram_addr.h | 4 +-- memory.c | 66 ++++++++++++++++++++++++++++++++++++++++--------- 5 files changed, 119 insertions(+), 24 deletions(-)
backends/hostmem-ram.c +2 -2
@@ -26,8 +26,8 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } path =object_get_canonical_path_component (OBJECT (backend)); -memory_region_init_ram (&backend->mr,OBJECT (backend), path, - backend->size); +memory_region_init_ram_may_fail (&backend->mr,OBJECT (backend), path, + backend->size, errp);g_free (path); }
exec.c +23 -9
@@ -1224,7 +1224,7 @@ static int memory_try_enable_merging(void *addr, size_t len)return qemu_madvise (addr, len,QEMU_MADV_MERGEABLE ); } -static ram_addr_t ram_block_add (RAMBlock *new_block) +static ram_addr_t ram_block_add (RAMBlock *new_block,Error **errp) {RAMBlock *block;ram_addr_t old_ram_size, new_ram_size;
@@ -1241,9 +1241,11 @@ static ram_addr_t ram_block_add(RAMBlock *new_block) }else { new_block->host =phys_mem_alloc (new_block->length);if (!new_block->host) { -fprintf (stderr,"Cannot set up guest memory '%s': %s\n" , - new_block->mr->name,strerror (errno)); -exit (1 ); +error_setg_errno (errp, errno, +"cannot set up guest memory '%s'" , + new_block->mr->name); +qemu_mutex_unlock_ramlist (); +return -1 ; }memory_try_enable_merging (new_block->host, new_block->length); }
@@ -1294,6 +1296,7 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, Error **errp) {RAMBlock *new_block; +ram_addr_t addr;if (xen_enabled ()) {error_setg (errp,"-mem-path not supported with Xen" );
@@ -1323,14 +1326,20 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, return -1; } -return ram_block_add (new_block); + addr =ram_block_add (new_block, errp); +if (errp && *errp) { +g_free (new_block); +return -1 ; + } +return addr; }#endif ram_addr_t qemu_ram_alloc_from_ptr (ram_addr_t size,void *host, -MemoryRegion *mr) +MemoryRegion *mr,Error **errp) {RAMBlock *new_block; +ram_addr_t addr; size =TARGET_PAGE_ALIGN (size); new_block =g_malloc0 (sizeof (*new_block));
@@ -1341,12 +1350,17 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,if (host) { new_block->flags |=RAM_PREALLOC ; } -return ram_block_add (new_block); + addr =ram_block_add (new_block, errp); +if (errp && *errp) { +g_free (new_block); +return -1 ; + } +return addr; } -ram_addr_t qemu_ram_alloc (ram_addr_t size,MemoryRegion *mr) +ram_addr_t qemu_ram_alloc (ram_addr_t size,MemoryRegion *mr,Error **errp) { -return qemu_ram_alloc_from_ptr (size,NULL , mr); +return qemu_ram_alloc_from_ptr (size,NULL , mr, errp); }void qemu_ram_free_from_ptr (ram_addr_t addr)
include/exec/memory.h +37 -0
@@ -304,6 +304,23 @@ void memory_region_init_io(MemoryRegion *mr, uint64_t size);/** +* memory_region_init_ram_may_fail: Initialize RAM memory region. Accesses +* into the region will modify memory +* directly. +* +* @mr: the #MemoryRegion to be initialized. +* @owner: the object that tracks the region's reference count +* @name: the name of the region. +* @size: size of the region. +* @errp: pointer to Error*, to store an error if it happens. +*/ +void memory_region_init_ram_may_fail (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size, +Error **errp); + +/** * memory_region_init_ram: Initialize RAM memory region. Accesses into the * region will modify memory directly. *
@@ -340,6 +357,25 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,#endif /** +* memory_region_init_ram_ptr_may_fail: Initialize RAM memory region from a +* user-provided pointer. Accesses into +* the region will modify memory directly. +* +* @mr: the #MemoryRegion to be initialized. +* @owner: the object that tracks the region's reference count +* @name: the name of the region. +* @size: size of the region. +* @ptr: memory to be mapped; must contain at least @size bytes. +* @errp: pointer to Error*, to store an error if it happens. +*/ +void memory_region_init_ram_ptr_may_fail (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size, +void *ptr, +Error **errp); + +/** * memory_region_init_ram_ptr: Initialize RAM memory region from a * user-provided pointer. Accesses into the * region will modify memory directly.
@@ -384,6 +420,7 @@ void memory_region_init_alias(MemoryRegion *mr,* @ops: callbacks for write access handling. * @name: the name of the region. * @size: size of the region. +* @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_device(MemoryRegion *mr, struct Object *owner,
include/exec/ram_addr.h +2 -2
@@ -26,8 +26,8 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, bool share, const char *mem_path, Error **errp);ram_addr_t qemu_ram_alloc_from_ptr (ram_addr_t size,void *host, -MemoryRegion *mr); -ram_addr_t qemu_ram_alloc (ram_addr_t size,MemoryRegion *mr); +MemoryRegion *mr,Error **errp); +ram_addr_t qemu_ram_alloc (ram_addr_t size,MemoryRegion *mr,Error **errp);int qemu_get_ram_fd (ram_addr_t addr);void *qemu_get_ram_block_host_ptr (ram_addr_t addr);void *qemu_get_ram_ptr (ram_addr_t addr);
memory.c +55 -11
107 lines not on this page · raw message
Signature · 1 line
1.9.3
Re: [Qemu-devel] [PATCH v4 1/6] memory: add memory_region_init_ram_may_fail() and memory_region_init_ram_ptr_may_fail()
Quoted 5 lines · Hu Tao
These two are almost the same as
memory_region_init_ram()andmemory_region_init_ram_ptr()except that they have an extra errp parameter to let callers handle error. The purpose is to fix the bug described below.
Quoted 8 lines
We should have added errp directly to
memory_region_ram(), but that mixes updates to calls tomemory_region_ram()and this bug fix and make it hard to review.We will rename
_may_failvariants later so that we will have two versions of API: one with errpparameter(memory_region_init_ram(), memory_region_init_ram_ptr()), one without errp parameter and with suffix_nofail.
That feels like overkill. Every caller that calls the _nofail variant can instead call memory_region_init_ram(..., &error_abort), and then you don't need the _nofail version.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH v4 1/6] memory: add memory_region_init_ram_may_fail() and memory_region_init_ram_ptr_may_fail()
Quoted 10 lines · Eric Blake
Quoted 9 lines · Hu Tao
These two are almost the same as
memory_region_init_ram()andmemory_region_init_ram_ptr()except that they have an extra errp parameter to let callers handle error. The purpose is to fix the bug described below.We should have added errp directly to
memory_region_ram(), but that mixes updates to calls tomemory_region_ram()and this bug fix and make it hard to review.
Quoted 8 lines
Quoted 4 lines
We will rename
_may_failvariants later so that we will have two versions of API: one with errpparameter(memory_region_init_ram(), memory_region_init_ram_ptr()), one without errp parameter and with suffix_nofail.That feels like overkill. Every caller that calls the
_nofailvariant can instead callmemory_region_init_ram(..., &error_abort), and then you don't need the_nofailversion.
Right. v5 is coming soon.
Regards,
Hu
PATCH v4 2/6 exec: improve error handling and reporting in file_ram_alloc() and gethugepagesize()
In reply to Hu TaoThis patch fixes two problems of memory-backend-file:
1. If user adds a memory-backend-file object using object_add command, specifying a non-existing directory for property mem-path, qemu will core dump with message:
/nonexistingdir: No such file or directory
Bad ram offset fffffffffffff000
Aborted (core dumped)
with this patch, qemu reports error message like:
qemu-system-x86_64: -object memory-backend-file,mem-path=/nonexistingdir,id=mem-file0,size=128M:
failed to stat file /nonexistingdir: No such file or directory
2. If user adds a memory-backend-file object using object_add command, specifying a size that is less than huge page size, qemu will core dump with message:
Bad ram offset fffffffffffff000
Aborted (core dumped)
with this patch, qemu reports error message like:
qemu-system-x86_64: -object memory-backend-file,mem-path=/hugepages,id=mem-file0,size=1M: memory size 0x100000 should be euqal or larger than huge page size 0x200000
Signed-off-by Hu Tao <[email protected]>
--- exec.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
exec.c +12 -9
@@ -996,7 +996,7 @@ void qemu_mutex_unlock_ramlist(void)#define HUGETLBFS_MAGIC 0x958458f6 -static long gethugepagesize (const char *path) +static long gethugepagesize (const char *path,Error **errp) {struct statfs fs;int ret;
@@ -1006,7 +1006,7 @@ static long gethugepagesize(const char *path) }while (ret !=0 && errno ==EINTR );if (ret !=0 ) { -perror (path); +error_setg_errno (errp, errno,"failed to get size of file %s" , path);return 0 ; }
@@ -1024,17 +1024,20 @@ static void *file_ram_alloc(RAMBlock *block,char *filename;char *sanitized_name;char *c; -void *area; +void *area =NULL ;int fd; -unsigned long hpagesize; +uint64_t hpagesize; - hpagesize =gethugepagesize (path); -if (!hpagesize) { + hpagesize =gethugepagesize (path, errp); +if (errp && *errp) { goto error; }if (memory < hpagesize) { -return NULL ; +error_setg (errp,"memory size 0x" RAM_ADDR_FMT " must be euqal to " +"or larger than huge page size 0x%" PRIx64, + memory, hpagesize); + goto error; }if (kvm_enabled () && !kvm_has_sync_mmu ()) {
@@ -1094,8 +1097,8 @@ static void *file_ram_alloc(RAMBlock *block,return area; error: -if (mem_prealloc) { -exit (1 ); +if (area && area !=MAP_FAILED ) { +munmap (area, memory); }return NULL ; }
Signature · 1 line
1.9.3
PATCH v4 3/6 rename memory_region_init_ram to memory_region_init_ram_nofail
In reply to Hu TaoSigned-off-by Hu Tao <[email protected]>
--- hw/alpha/typhoon.c | 2 +- hw/arm/armv7m.c | 6 +++--- hw/arm/cubieboard.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 9 +++++---- hw/arm/highbank.c | 4 ++-- hw/arm/integratorcp.c | 5 +++-- hw/arm/kzm.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 5 +++-- hw/arm/omap1.c | 6 ++++-- hw/arm/omap2.c | 4 ++-- hw/arm/omap_sx1.c | 5 +++-- hw/arm/palm.c | 2 +- hw/arm/pxa2xx.c | 9 +++++---- hw/arm/realview.c | 7 ++++--- hw/arm/spitz.c | 2 +- hw/arm/strongarm.c | 3 ++- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 3 ++- hw/arm/vexpress.c | 10 +++++----- hw/arm/virt.c | 3 ++- hw/arm/xilinx_zynq.c | 4 ++-- hw/block/onenand.c | 2 +- hw/core/loader.c | 2 +- hw/cris/axis_dev88.c | 5 +++-- hw/display/cg3.c | 5 +++-- hw/display/qxl.c | 6 +++--- hw/display/sm501.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 5 +++-- hw/display/vga.c | 2 +- hw/display/vmware_vga.c | 3 ++- hw/i386/kvm/pci-assign.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_sysfw.c | 4 ++-- hw/input/milkymist-softusb.c | 4 ++-- hw/lm32/lm32_boards.c | 5 +++-- hw/lm32/milkymist.c | 3 ++- hw/m68k/an5206.c | 4 ++-- hw/m68k/dummy_m68k.c | 2 +- hw/m68k/mcf5208.c | 4 ++-- hw/microblaze/petalogix_ml605_mmu.c | 7 ++++--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 5 +++-- hw/mips/mips_fulong2e.c | 4 ++-- hw/mips/mips_jazz.c | 7 ++++--- hw/mips/mips_malta.c | 4 ++-- hw/mips/mips_mipssim.c | 4 ++-- hw/mips/mips_r4k.c | 4 ++-- hw/moxie/moxiesim.c | 4 ++-- hw/net/milkymist-minimac2.c | 4 ++-- hw/openrisc/openrisc_sim.c | 2 +- hw/pci-host/prep.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 7 ++++--- hw/ppc/ppc405_uc.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/shix.c | 6 +++--- hw/sparc/leon3.c | 4 ++-- hw/sparc/sun4m.c | 9 +++++---- hw/sparc64/sun4u.c | 5 +++-- hw/unicore32/puv3.c | 2 +- hw/xtensa/sim.c | 4 ++-- hw/xtensa/xtfpga.c | 6 +++--- include/exec/memory.h | 12 ++++++------ memory.c | 8 ++++---- numa.c | 4 ++-- xen-hvm.c | 2 +- 72 files changed, 159 insertions(+), 136 deletions(-)
hw/alpha/typhoon.c +1 -1
@@ -843,7 +843,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,/* Main memory region, 0x00.0000.0000. Real hardware supports 32GB, but the address space hole reserved at this point is 8TB. */ -memory_region_init_ram (&s->ram_region,OBJECT (s),"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram_region,OBJECT (s),"ram" , ram_size);vmstate_register_ram_global (&s->ram_region);memory_region_add_subregion (addr_space,0 , &s->ram_region);
hw/arm/armv7m.c +3 -3
@@ -210,11 +210,11 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,#endif /* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"armv7m.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,0 , flash); -memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"armv7m.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x20000000 , sram);armv7m_bitband_init ();
@@ -255,7 +255,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,/* Hack to map an additional page of ram at the top of the address space. This stops qemu complaining about executing code outside RAM when returning from an exception. */ -memory_region_init_ram (hack,NULL ,"armv7m.hack" ,0x1000 ); +memory_region_init_ram_nofail (hack,NULL ,"armv7m.hack" ,0x1000 );vmstate_register_ram_global (hack);memory_region_add_subregion (address_space_mem,0xfffff000 , hack);
hw/arm/cubieboard.c +1 -1
@@ -63,7 +63,7 @@ static void cubieboard_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"cubieboard.ram" , +memory_region_init_ram_nofail (&s->sdram,NULL ,"cubieboard.ram" , machine->ram_size);vmstate_register_ram_global (&s->sdram); memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,
hw/arm/digic_boards.c +1 -1
@@ -51,7 +51,7 @@ typedef struct DigicBoard {static void digic4_board_setup_ram (DigicBoardState *s,hwaddr ram_size) { -memory_region_init_ram (&s->ram,NULL ,"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram,NULL ,"ram" , ram_size);memory_region_add_subregion (get_system_memory (),0 , &s->ram);vmstate_register_ram_global (&s->ram); }
hw/arm/exynos4210.c +5 -4
@@ -247,7 +247,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->chipid_mem);/* Internal ROM */ -memory_region_init_ram (&s->irom_mem,NULL ,"exynos4210.irom" , +memory_region_init_ram_nofail (&s->irom_mem,NULL ,"exynos4210.irom" ,EXYNOS4210_IROM_SIZE );vmstate_register_ram_global (&s->irom_mem);memory_region_set_readonly (&s->irom_mem, true);
@@ -263,7 +263,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->irom_alias_mem);/* Internal RAM */ -memory_region_init_ram (&s->iram_mem,NULL ,"exynos4210.iram" , +memory_region_init_ram_nofail (&s->iram_mem,NULL ,"exynos4210.iram" ,EXYNOS4210_IRAM_SIZE );vmstate_register_ram_global (&s->iram_mem); memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,
@@ -272,14 +272,15 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,/* DRAM */ mem_size = ram_size;if (mem_size >EXYNOS4210_DRAM_MAX_SIZE ) { -memory_region_init_ram (&s->dram1_mem,NULL ,"exynos4210.dram1" , +memory_region_init_ram_nofail (&s->dram1_mem,NULL ,"exynos4210.dram1" , mem_size -EXYNOS4210_DRAM_MAX_SIZE );vmstate_register_ram_global (&s->dram1_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM1_BASE_ADDR , &s->dram1_mem); mem_size =EXYNOS4210_DRAM_MAX_SIZE ; } -memory_region_init_ram (&s->dram0_mem,NULL ,"exynos4210.dram0" , mem_size); +memory_region_init_ram_nofail (&s->dram0_mem,NULL ,"exynos4210.dram0" , + mem_size);vmstate_register_ram_global (&s->dram0_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM0_BASE_ADDR , &s->dram0_mem);
hw/arm/highbank.c +2 -2
@@ -255,12 +255,12 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) sysmem =get_system_memory (); dram =g_new (MemoryRegion,1 ); -memory_region_init_ram (dram,NULL ,"highbank.dram" , ram_size); +memory_region_init_ram_nofail (dram,NULL ,"highbank.dram" , ram_size);/* SDRAM at address zero. */ memory_region_add_subregion (sysmem,0 , dram); sysram =g_new (MemoryRegion,1 ); -memory_region_init_ram (sysram,NULL ,"highbank.sysram" ,0x8000 ); +memory_region_init_ram_nofail (sysram,NULL ,"highbank.sysram" ,0x8000 );memory_region_add_subregion (sysmem,0xfff88000 , sysram);if (bios_name !=NULL ) { sysboot_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);
hw/arm/integratorcp.c +3 -2
@@ -264,7 +264,8 @@ static int integratorcm_init(SysBusDevice *dev) s->cm_init =0x00000112 ; s->cm_refcnt_offset =muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ),24 ,1000 ); -memory_region_init_ram (&s->flash,OBJECT (s),"integrator.flash" ,0x100000 ); +memory_region_init_ram_nofail (&s->flash,OBJECT (s),"integrator.flash" , +0x100000 );vmstate_register_ram_global (&s->flash); memory_region_init_io(&s->iomem, OBJECT(s), &integratorcm_ops, s,
@@ -485,7 +486,7 @@ static void integratorcp_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"integrator.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"integrator.ram" , ram_size);vmstate_register_ram_global (ram);/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ /* ??? RAM should repeat to fill physical memory space. */
hw/arm/kzm.c +2 -2
@@ -97,14 +97,14 @@ static void kzm_init(MachineState *machine)/* On a real system, the first 16k is a `secure boot rom' */ -memory_region_init_ram (ram,NULL ,"kzm.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"kzm.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,KZM_RAMADDRESS , ram);memory_region_init_alias (ram_alias,NULL ,"ram.alias" , ram,0 , ram_size);memory_region_add_subregion (address_space_mem,0x88000000 , ram_alias); -memory_region_init_ram (sram,NULL ,"kzm.sram" ,0x4000 ); +memory_region_init_ram_nofail (sram,NULL ,"kzm.sram" ,0x4000 );memory_region_add_subregion (address_space_mem,0x1FFFC000 , sram); dev = sysbus_create_varargs("imx_avic", 0x68000000,
hw/arm/mainstone.c +1 -1
@@ -123,7 +123,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,/* Setup CPU & memory */ mpu =pxa270_init (address_space_mem, mainstone_binfo.ram_size, cpu_model); -memory_region_init_ram (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);
hw/arm/musicpal.c +3 -2
@@ -1601,11 +1601,12 @@ static void musicpal_init(MachineState *machine) }/* For now we use a fixed - the original - RAM size */ -memory_region_init_ram (ram,NULL ,"musicpal.ram" ,MP_RAM_DEFAULT_SIZE ); +memory_region_init_ram_nofail (ram,NULL ,"musicpal.ram" , +MP_RAM_DEFAULT_SIZE );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram); -memory_region_init_ram (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE ); +memory_region_init_ram_nofail (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,MP_SRAM_BASE , sram);
hw/arm/omap1.c +4 -2
@@ -3854,10 +3854,12 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->emiff_ram,NULL ,"omap1.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->emiff_ram,NULL ,"omap1.dram" , + s->sdram_size);vmstate_register_ram_global (&s->emiff_ram);memory_region_add_subregion (system_memory,OMAP_EMIFF_BASE , &s->emiff_ram); -memory_region_init_ram (&s->imif_ram,NULL ,"omap1.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->imif_ram,NULL ,"omap1.sram" , + s->sram_size);vmstate_register_ram_global (&s->imif_ram);memory_region_add_subregion (system_memory,OMAP_IMIF_BASE , &s->imif_ram);
hw/arm/omap2.c +2 -2
@@ -2266,10 +2266,10 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->sdram,NULL ,"omap2.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"omap2.dram" , s->sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,OMAP2_Q2_BASE , &s->sdram); -memory_region_init_ram (&s->sram,NULL ,"omap2.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->sram,NULL ,"omap2.sram" , s->sram_size);vmstate_register_ram_global (&s->sram);memory_region_add_subregion (sysmem,OMAP2_SRAM_BASE , &s->sram);
hw/arm/omap_sx1.c +3 -2
@@ -122,7 +122,7 @@ static void sx1_init(MachineState *machine, const int version) machine->cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"omap_sx1.flash0-0" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"omap_sx1.flash0-0" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space,OMAP_CS0_BASE , flash);
@@ -164,7 +164,8 @@ static void sx1_init(MachineState *machine, const int version)if ((version ==1 ) && (dinfo =drive_get (IF_PFLASH ,0 , fl_idx)) !=NULL ) { -memory_region_init_ram (flash_1,NULL ,"omap_sx1.flash1-0" , flash1_size); +memory_region_init_ram_nofail (flash_1,NULL ,"omap_sx1.flash1-0" , + flash1_size);vmstate_register_ram_global (flash_1);memory_region_set_readonly (flash_1, true);memory_region_add_subregion (address_space,OMAP_CS1_BASE , flash_1);
hw/arm/palm.c +1 -1
@@ -212,7 +212,7 @@ static void palmte_init(MachineState *machine) mpu =omap310_mpu_init (address_space_mem, sdram_size, cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"palmte.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"palmte.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,OMAP_CS0_BASE , flash);
hw/arm/pxa2xx.c +5 -4
@@ -2055,10 +2055,11 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa270.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa270.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa270.internal" ,0x40000 ); +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa270.internal" , +0x40000 );vmstate_register_ram_global (&s->internal);memory_region_add_subregion (address_space,PXA2XX_INTERNAL_BASE , &s->internal);
@@ -2186,10 +2187,10 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa255.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa255.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa255.internal" , +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa255.internal" ,PXA2XX_INTERNAL_SIZE );vmstate_register_ram_global (&s->internal); memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE,
hw/arm/realview.c +4 -3
@@ -137,12 +137,13 @@ static void realview_init(MachineState *machine,/* Core tile RAM. */ low_ram_size = ram_size -0x20000000 ; ram_size =0x20000000 ; -memory_region_init_ram (ram_lo,NULL ,"realview.lowmem" , low_ram_size); +memory_region_init_ram_nofail (ram_lo,NULL ,"realview.lowmem" , + low_ram_size);vmstate_register_ram_global (ram_lo);memory_region_add_subregion (sysmem,0x20000000 , ram_lo); } -memory_region_init_ram (ram_hi,NULL ,"realview.highmem" , ram_size); +memory_region_init_ram_nofail (ram_hi,NULL ,"realview.highmem" , ram_size);vmstate_register_ram_global (ram_hi); low_ram_size = ram_size;if (low_ram_size >0x10000000 )
@@ -337,7 +338,7 @@ static void realview_init(MachineState *machine,startup code. I guess this works on real hardware because the BootROM happens to be in ROM/flash or in memory that isn't clobbered until after Linux boots the secondary CPUs. */ -memory_region_init_ram (ram_hack,NULL ,"realview.hack" ,0x1000 ); +memory_region_init_ram_nofail (ram_hack,NULL ,"realview.hack" ,0x1000 );vmstate_register_ram_global (ram_hack);memory_region_add_subregion (sysmem,SMP_BOOT_ADDR , ram_hack);
hw/arm/spitz.c +1 -1
@@ -912,7 +912,7 @@ static void spitz_common_init(MachineState *machine,sl_flash_register (mpu, (model == spitz) ?FLASH_128M :FLASH_1024M ); -memory_region_init_ram (rom,NULL ,"spitz.rom" ,SPITZ_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"spitz.rom" ,SPITZ_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);
hw/arm/strongarm.c +2 -1
@@ -1604,7 +1604,8 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"strongarm.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"strongarm.sdram" , + sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,SA_SDCS0 , &s->sdram);
hw/arm/tosa.c +1 -1
@@ -228,7 +228,7 @@ static void tosa_init(MachineState *machine) mpu =pxa255_init (address_space_mem, tosa_binfo.ram_size); -memory_region_init_ram (rom,NULL ,"tosa.rom" ,TOSA_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"tosa.rom" ,TOSA_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);
hw/arm/versatilepb.c +2 -1
@@ -198,7 +198,8 @@ static void versatile_init(MachineState *machine, int board_id)fprintf (stderr,"Unable to find CPU definition\n" );exit (1 ); } -memory_region_init_ram (ram,NULL ,"versatile.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"versatile.ram" , + machine->ram_size);vmstate_register_ram_global (ram);/* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */
hw/arm/vexpress.c +5 -5
@@ -252,7 +252,7 @@ static void a9_daughterboard_init(const VEDBoardInfo *daughterboard,exit (1 ); } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram); low_ram_size = ram_size;if (low_ram_size >0x4000000 ) {
@@ -346,7 +346,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard, } } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram);/* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */ memory_region_add_subregion (sysmem,0x80000000 , ram);
@@ -364,7 +364,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard,/* 0x2b060000: SP805 watchdog: not modelled */ /* 0x2b0a0000: PL341 dynamic memory controller: not modelled */ /* 0x2e000000: system SRAM */ -memory_region_init_ram (sram,NULL ,"vexpress.a15sram" ,0x10000 ); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.a15sram" ,0x10000 );vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0x2e000000 , sram);
@@ -634,12 +634,12 @@ static void vexpress_common_init(VEDBoardInfo *daughterboard, } sram_size =0x2000000 ; -memory_region_init_ram (sram,NULL ,"vexpress.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem, map[VE_SRAM ], sram); vram_size =0x800000 ; -memory_region_init_ram (vram,NULL ,"vexpress.vram" , vram_size); +memory_region_init_ram_nofail (vram,NULL ,"vexpress.vram" , vram_size);vmstate_register_ram_global (vram);memory_region_add_subregion (sysmem, map[VE_VIDEORAM ], vram);
hw/arm/virt.c +2 -1
@@ -489,7 +489,8 @@ static void machvirt_init(MachineState *machine)fdt_add_cpu_nodes (vbi);fdt_add_psci_node (vbi); -memory_region_init_ram (ram,NULL ,"mach-virt.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mach-virt.ram" , + machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem, vbi->memmap[VIRT_MEM ].base, ram);
hw/arm/xilinx_zynq.c +2 -2
@@ -149,12 +149,12 @@ static void zynq_init(MachineState *machine) }/* DDR remapped to address zero. */ -memory_region_init_ram (ext_ram,NULL ,"zynq.ext_ram" , ram_size); +memory_region_init_ram_nofail (ext_ram,NULL ,"zynq.ext_ram" , ram_size);vmstate_register_ram_global (ext_ram);memory_region_add_subregion (address_space_mem,0 , ext_ram);/* 256K of on-chip memory */ -memory_region_init_ram (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 ); +memory_region_init_ram_nofail (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 );vmstate_register_ram_global (ocm_ram);memory_region_add_subregion (address_space_mem,0xFFFC0000 , ocm_ram);
hw/block/onenand.c +1 -1
@@ -788,7 +788,7 @@ static int onenand_initfn(SysBusDevice *sbd) } s->otp =memset (g_malloc ((64 +2 ) <<PAGE_SHIFT ),0xff , (64 +2 ) <<PAGE_SHIFT ); -memory_region_init_ram (&s->ram,OBJECT (s),"onenand.ram" , +memory_region_init_ram_nofail (&s->ram,OBJECT (s),"onenand.ram" ,0xc000 << s->shift);vmstate_register_ram_global (&s->ram); ram =memory_region_get_ram_ptr (&s->ram);
hw/core/loader.c +1 -1
@@ -632,7 +632,7 @@ static void *rom_set_mr(Rom *rom, Object *owner, const char *name)void *data; rom->mr =g_malloc (sizeof (*rom->mr)); -memory_region_init_ram (rom->mr, owner, name, rom->datasize); +memory_region_init_ram_nofail (rom->mr, owner, name, rom->datasize);memory_region_set_readonly (rom->mr, true);vmstate_register_ram_global (rom->mr);
hw/cris/axis_dev88.c +3 -2
@@ -270,13 +270,14 @@ void axisdev88_init(MachineState *machine) env = &cpu->env;/* allocate RAM */ -memory_region_init_ram (phys_ram,NULL ,"axisdev88.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"axisdev88.ram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem,0x40000000 , phys_ram);/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the internal memory. */ -memory_region_init_ram (phys_intmem,NULL ,"axisdev88.chipram" ,INTMEM_SIZE ); +memory_region_init_ram_nofail (phys_intmem,NULL ,"axisdev88.chipram" , +INTMEM_SIZE );vmstate_register_ram_global (phys_intmem);memory_region_add_subregion (address_space_mem,0x38000000 , phys_intmem);
hw/display/cg3.c +3 -2
@@ -279,7 +279,8 @@ static void cg3_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);CG3State *s =CG3 (obj); -memory_region_init_ram (&s->rom,NULL ,"cg3.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"cg3.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);
@@ -306,7 +307,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp) } } -memory_region_init_ram (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size);vmstate_register_ram_global (&s->vram_mem);sysbus_init_mmio (sbd, &s->vram_mem);
hw/display/qxl.c +3 -3
@@ -1978,14 +1978,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)pci_set_byte (&config[PCI_INTERRUPT_PIN ],1 ); qxl->rom_size =qxl_rom_size (); -memory_region_init_ram (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , +memory_region_init_ram_nofail (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , qxl->rom_size);vmstate_register_ram (&qxl->rom_bar, &qxl->pci.qdev);init_qxl_rom (qxl);init_qxl_ram (qxl); qxl->guest_surfaces.cmds =g_new0 (QXLPHYSICAL , qxl->ssd.num_surfaces); -memory_region_init_ram (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , +memory_region_init_ram_nofail (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , qxl->vram_size);vmstate_register_ram (&qxl->vram_bar, &qxl->pci.qdev); memory_region_init_alias(&qxl->vram32_bar, OBJECT(qxl), "qxl.vram32",
@@ -2093,7 +2093,7 @@ static int qxl_init_secondary(PCIDevice *dev) qxl->id = device_id++;qxl_init_ramsize (qxl); -memory_region_init_ram (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , +memory_region_init_ram_nofail (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , qxl->vga.vram_size);vmstate_register_ram (&qxl->vga.vram, &qxl->pci.qdev); qxl->vga.vram_ptr =memory_region_get_ram_ptr (&qxl->vga.vram);
hw/display/sm501.c +1 -1
@@ -1409,7 +1409,7 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t base, s->dc_crt_control =0x00010000 ;/* allocate local memory */ -memory_region_init_ram (&s->local_mem_region,NULL ,"sm501.local" , +memory_region_init_ram_nofail (&s->local_mem_region,NULL ,"sm501.local" , local_mem_bytes);vmstate_register_ram_global (&s->local_mem_region); s->local_mem =memory_region_get_ram_ptr (&s->local_mem_region);
hw/display/tc6393xb.c +1 -1
@@ -581,7 +581,7 @@ TC6393xbState *tc6393xb_init(MemoryRegion *sysmem, uint32_t base, qemu_irq irq)memory_region_init_io (&s->iomem,NULL , &tc6393xb_ops, s,"tc6393xb" ,0x10000 );memory_region_add_subregion (sysmem, base, &s->iomem); -memory_region_init_ram (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 ); +memory_region_init_ram_nofail (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 );vmstate_register_ram_global (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);memory_region_add_subregion (sysmem, base +0x100000 , &s->vram);
hw/display/tcx.c +3 -2
@@ -535,7 +535,8 @@ static void tcx_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);TCXState *s =TCX (obj); -memory_region_init_ram (&s->rom,NULL ,"tcx.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"tcx.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);
@@ -566,7 +567,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)uint8_t *vram_base;char *fcode_filename; -memory_region_init_ram (&s->vram_mem,OBJECT (s),"tcx.vram" , +memory_region_init_ram_nofail (&s->vram_mem,OBJECT (s),"tcx.vram" , s->vram_size * (1 +4 +4 ));vmstate_register_ram_global (&s->vram_mem); vram_base =memory_region_get_ram_ptr (&s->vram_mem);
hw/display/vga.c +1 -1
@@ -2291,7 +2291,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) s->vram_size_mb = s->vram_size >>20 ; s->is_vbe_vmstate =1 ; -memory_region_init_ram (&s->vram, obj,"vga.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram, obj,"vga.vram" , s->vram_size);vmstate_register_ram (&s->vram, global_vmstate ?NULL :DEVICE (obj));xen_register_framebuffer (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);
hw/display/vmware_vga.c +2 -1
@@ -1201,7 +1201,8 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, s->vga.con =graphic_console_init (dev,0 , &vmsvga_ops, s); s->fifo_size =SVGA_FIFO_SIZE ; -memory_region_init_ram (&s->fifo_ram,NULL ,"vmsvga.fifo" , s->fifo_size); +memory_region_init_ram_nofail (&s->fifo_ram,NULL ,"vmsvga.fifo" , + s->fifo_size);vmstate_register_ram_global (&s->fifo_ram); s->fifo_ptr =memory_region_get_ram_ptr (&s->fifo_ram);
hw/i386/kvm/pci-assign.c +1 -1
@@ -1943,7 +1943,7 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (dev))); -memory_region_init_ram (&dev->dev.rom,OBJECT (dev), name, st.st_size); +memory_region_init_ram_nofail (&dev->dev.rom,OBJECT (dev), name, st.st_size);vmstate_register_ram (&dev->dev.rom, &dev->dev.qdev); ptr =memory_region_get_ram_ptr (&dev->dev.rom);memset (ptr,0xff , st.st_size);
hw/i386/pc.c +1 -1
@@ -1272,7 +1272,7 @@ FWCfgState *pc_memory_init(MachineState *machine,pc_system_firmware_init (rom_memory, guest_info->isapc_ram_fw); option_rom_mr =g_malloc (sizeof (*option_rom_mr)); -memory_region_init_ram (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE ); +memory_region_init_ram_nofail (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE );vmstate_register_ram_global (option_rom_mr); memory_region_add_subregion_overlap(rom_memory, PC_ROM_MIN_VGA,
hw/i386/pc_sysfw.c +2 -2
@@ -55,7 +55,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory,/* map the last 128KB of the BIOS in ISA space */ isa_bios_size =MIN (flash_size,128 *1024 ); isa_bios =g_malloc (sizeof (*isa_bios)); -memory_region_init_ram (isa_bios,NULL ,"isa-bios" , isa_bios_size); +memory_region_init_ram_nofail (isa_bios,NULL ,"isa-bios" , isa_bios_size);vmstate_register_ram_global (isa_bios); memory_region_add_subregion_overlap(rom_memory, 0x100000 - isa_bios_size,
@@ -192,7 +192,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) goto bios_error; } bios =g_malloc (sizeof (*bios)); -memory_region_init_ram (bios,NULL ,"pc.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"pc.bios" , bios_size);vmstate_register_ram_global (bios);if (!isapc_ram_fw) {memory_region_set_readonly (bios, true);
hw/input/milkymist-softusb.c +2 -2
@@ -249,12 +249,12 @@ static int milkymist_softusb_init(SysBusDevice *dev)sysbus_init_mmio (dev, &s->regs_region);/* register pmem and dmem */ -memory_region_init_ram (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , +memory_region_init_ram_nofail (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , s->pmem_size);vmstate_register_ram_global (&s->pmem); s->pmem_ptr =memory_region_get_ram_ptr (&s->pmem);sysbus_init_mmio (dev, &s->pmem); -memory_region_init_ram (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , +memory_region_init_ram_nofail (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , s->dmem_size);vmstate_register_ram_global (&s->dmem); s->dmem_ptr =memory_region_get_ram_ptr (&s->dmem);
hw/lm32/lm32_boards.c +3 -2
@@ -111,7 +111,7 @@ static void lm32_evr_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_evr.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_evr.sdram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);
@@ -213,7 +213,8 @@ static void lm32_uclinux_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_uclinux.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_uclinux.sdram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);
hw/lm32/milkymist.c +2 -1
@@ -118,7 +118,8 @@ milkymist_init(MachineState *machine)cpu_lm32_set_phys_msb_ignore (env,1 ); -memory_region_init_ram (phys_sdram,NULL ,"milkymist.sdram" , sdram_size); +memory_region_init_ram_nofail (phys_sdram,NULL ,"milkymist.sdram" , + sdram_size);vmstate_register_ram_global (phys_sdram);memory_region_add_subregion (address_space_mem, sdram_base, phys_sdram);
hw/m68k/an5206.c +2 -2
@@ -50,12 +50,12 @@ static void an5206_init(MachineState *machine) env->rambar0 =AN5206_RAMBAR_ADDR |1 ;/* DRAM at address zero */ -memory_region_init_ram (ram,NULL ,"an5206.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"an5206.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"an5206.sram" ,512 ); +memory_region_init_ram_nofail (sram,NULL ,"an5206.sram" ,512 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,AN5206_RAMBAR_ADDR , sram);
hw/m68k/dummy_m68k.c +1 -1
@@ -40,7 +40,7 @@ static void dummy_m68k_init(MachineState *machine) env->vbr =0 ;/* RAM at address zero */ -memory_region_init_ram (ram,NULL ,"dummy_m68k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"dummy_m68k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);
hw/m68k/mcf5208.c +2 -2
@@ -218,12 +218,12 @@ static void mcf5208evb_init(MachineState *machine)/* TODO: Configure BARs. */ /* DRAM at 0x40000000 */ -memory_region_init_ram (ram,NULL ,"mcf5208.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mcf5208.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"mcf5208.sram" ,16384 ); +memory_region_init_ram_nofail (sram,NULL ,"mcf5208.sram" ,16384 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x80000000 , sram);
hw/microblaze/petalogix_ml605_mmu.c +4 -3
@@ -99,12 +99,13 @@ petalogix_ml605_init(MachineState *machine)object_property_set_bool (OBJECT (cpu), true,"realized" , &error_abort);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL ,"petalogix_ml605.lmb_bram" , -LMB_BRAM_SIZE ); +memory_region_init_ram_nofail (phys_lmb_bram,NULL , +"petalogix_ml605.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (address_space_mem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_ml605.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_ml605.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ddr_base, phys_ram);
hw/microblaze/petalogix_s3adsp1800_mmu.c +3 -2
@@ -80,12 +80,13 @@ petalogix_s3adsp1800_init(MachineState *machine) cpu =cpu_mb_init (cpu_model);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL , +memory_region_init_ram_nofail (phys_lmb_bram,NULL ,"petalogix_s3adsp1800.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (sysmem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (sysmem, ddr_base, phys_ram);
hw/mips/mips_fulong2e.c +2 -2
@@ -302,9 +302,9 @@ static void mips_fulong2e_init(MachineState *machine) bios_size =1024 *1024 ;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"fulong2e.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"fulong2e.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"fulong2e.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"fulong2e.bios" , bios_size);vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);
hw/mips/mips_jazz.c +4 -3
@@ -179,11 +179,12 @@ static void mips_jazz_init(MemoryRegion *address_space, cc->do_unassigned_access = mips_jazz_do_unassigned_access;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"mips_jazz.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_jazz.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space,0 , ram); -memory_region_init_ram (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_jazz.bios" , +MAGNUM_BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true); memory_region_init_alias(bios2, NULL, "mips_jazz.bios", bios,
@@ -244,7 +245,7 @@ static void mips_jazz_init(MemoryRegion *address_space, {/* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr =g_new (MemoryRegion,1 ); -memory_region_init_ram (rom_mr,NULL ,"g364fb.rom" ,0x80000 ); +memory_region_init_ram_nofail (rom_mr,NULL ,"g364fb.rom" ,0x80000 );vmstate_register_ram_global (rom_mr);memory_region_set_readonly (rom_mr, true);uint8_t *rom =memory_region_get_ram_ptr (rom_mr);
hw/mips/mips_malta.c +2 -2
@@ -992,7 +992,7 @@ void mips_malta_init(MachineState *machine) }/* register RAM at high address where it is undisturbed by IO */ -memory_region_init_ram (ram_high,NULL ,"mips_malta.ram" , ram_size); +memory_region_init_ram_nofail (ram_high,NULL ,"mips_malta.ram" , ram_size);vmstate_register_ram_global (ram_high);memory_region_add_subregion (system_memory,0x80000000 , ram_high);
@@ -1116,7 +1116,7 @@ void mips_malta_init(MachineState *machine)* handled by an overlapping region as the resulting ROM code subpage * regions are not executable. */ -memory_region_init_ram (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE );if (!rom_copy (memory_region_get_ram_ptr (bios_copy),FLASH_ADDRESS ,BIOS_SIZE )) { memcpy(memory_region_get_ram_ptr(bios_copy),
hw/mips/mips_mipssim.c +2 -2
@@ -171,9 +171,9 @@ mips_mipssim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"mips_mipssim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_mipssim.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);
hw/mips/mips_r4k.c +2 -2
@@ -204,7 +204,7 @@ void mips_r4k_init(MachineState *machine) ((unsigned int)ram_size / (1 << 20)));exit (1 ); } -memory_region_init_ram (ram,NULL ,"mips_r4k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_r4k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);
@@ -231,7 +231,7 @@ void mips_r4k_init(MachineState *machine)#endif if ((bios_size >0 ) && (bios_size <=BIOS_SIZE )) { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),0x1fc00000 , bios);
hw/moxie/moxiesim.c +2 -2
@@ -123,11 +123,11 @@ static void moxiesim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, cpu);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"moxiesim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"moxiesim.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem, ram_base, ram); -memory_region_init_ram (rom,NULL ,"moxie.rom" ,128 *0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"moxie.rom" ,128 *0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0x1000 , rom);
hw/net/milkymist-minimac2.c +2 -2
@@ -471,8 +471,8 @@ static int milkymist_minimac2_init(SysBusDevice *sbd)sysbus_init_mmio (sbd, &s->regs_region);/* register buffers memory */ -memory_region_init_ram (&s->buffers,OBJECT (dev),"milkymist-minimac2.buffers" , - buffers_size); +memory_region_init_ram_nofail (&s->buffers,OBJECT (dev), +"milkymist-minimac2.buffers" , buffers_size);vmstate_register_ram_global (&s->buffers); s->rx0_buf =memory_region_get_ram_ptr (&s->buffers); s->rx1_buf = s->rx0_buf +MINIMAC2_BUFFER_SIZE ;
hw/openrisc/openrisc_sim.c +1 -1
@@ -114,7 +114,7 @@ static void openrisc_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"openrisc.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"openrisc.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram);
hw/pci-host/prep.c +1 -1
@@ -299,7 +299,7 @@ static int raven_init(PCIDevice *d) d->config[0x0D ] =0x10 ;// latency_timer d->config[0x34 ] =0x00 ;// capabilities_pointer -memory_region_init_ram (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE );memory_region_set_readonly (&s->bios, true);memory_region_add_subregion (get_system_memory (), (uint32_t )(-BIOS_SIZE ), &s->bios);
hw/pci/pci.c +1 -1
@@ -1974,7 +1974,7 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (pdev))); } pdev->has_rom = true; -memory_region_init_ram (&pdev->rom,OBJECT (pdev), name, size); +memory_region_init_ram_nofail (&pdev->rom,OBJECT (pdev), name, size);vmstate_register_ram (&pdev->rom, &pdev->qdev); ptr =memory_region_get_ram_ptr (&pdev->rom);load_image (path, ptr);
hw/ppc/mac_newworld.c +1 -1
@@ -204,7 +204,7 @@ static void ppc_core99_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )
hw/ppc/mac_oldworld.c +1 -1
@@ -135,7 +135,7 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )
hw/ppc/ppc405_boards.c +4 -3
@@ -214,7 +214,7 @@ static void ref405ep_init(MachineState *machine) 33333333, &pic, kernel_filename == NULL ? 0 : 1);/* allocate SRAM */ sram_size =512 *1024 ; -memory_region_init_ram (sram,NULL ,"ef405ep.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"ef405ep.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0xFFF00000 , sram);/* allocate and load BIOS */
@@ -246,7 +246,7 @@ static void ref405ep_init(MachineState *machine)printf ("Load BIOS from file\n" );#endif bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )
@@ -572,7 +572,8 @@ static void taihu_405ep_init(MachineState *machine)if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"taihu_405ep.bios" , +BIOS_SIZE );vmstate_register_ram_global (bios); filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);if (filename) {
hw/ppc/ppc405_uc.c +1 -1
@@ -974,7 +974,7 @@ static void ppc405_ocm_init(CPUPPCState *env) ocm =g_malloc0 (sizeof (ppc405_ocm_t));/* XXX: Size is 4096 or 0x04000000 */ -memory_region_init_ram (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 ); +memory_region_init_ram_nofail (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 );vmstate_register_ram_global (&ocm->isarc_ram);memory_region_init_alias (&ocm->dsarc_ram,NULL ,"ppc405.dsarc" , &ocm->isarc_ram,0 ,4096 );
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -110,7 +110,7 @@ static void ccw_init(MachineState *machine)virtio_ccw_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);
hw/s390x/s390-virtio.c +1 -1
@@ -256,7 +256,7 @@ static void s390_init(MachineState *machine)s390_virtio_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);
hw/sh4/r2d.c +1 -1
@@ -255,7 +255,7 @@ static void r2d_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate memory space */ -memory_region_init_ram (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE ); +memory_region_init_ram_nofail (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE );vmstate_register_ram_global (sdram);memory_region_add_subregion (address_space_mem,SDRAM_BASE , sdram);/* Register peripherals */
hw/sh4/shix.c +3 -3
@@ -59,14 +59,14 @@ static void shix_init(MachineState *machine) }/* Allocate memory space */ -memory_region_init_ram (rom,NULL ,"shix.rom" ,0x4000 ); +memory_region_init_ram_nofail (rom,NULL ,"shix.rom" ,0x4000 );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (sysmem,0x00000000 , rom); -memory_region_init_ram (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 );vmstate_register_ram_global (&sdram[0 ]);memory_region_add_subregion (sysmem,0x08000000 , &sdram[0 ]); -memory_region_init_ram (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 );vmstate_register_ram_global (&sdram[1 ]);memory_region_add_subregion (sysmem,0x0c000000 , &sdram[1 ]);
hw/sparc/leon3.c +2 -2
@@ -151,13 +151,13 @@ static void leon3_generic_hw_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"leon3.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"leon3.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Allocate BIOS */ prom_size =8 *1024 *1024 ;/* 8Mb */ -memory_region_init_ram (prom,NULL ,"Leon3.bios" , prom_size); +memory_region_init_ram_nofail (prom,NULL ,"Leon3.bios" , prom_size);vmstate_register_ram_global (prom);memory_region_set_readonly (prom, true);memory_region_add_subregion (address_space_mem,0x00000000 , prom);
hw/sparc/sun4m.c +5 -4
@@ -620,7 +620,7 @@ static int idreg_init1(SysBusDevice *dev) {IDRegState *s =MACIO_ID_REGISTER (dev); -memory_region_init_ram (&s->mem,OBJECT (s), +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.idreg" ,sizeof (idreg_data));vmstate_register_ram_global (&s->mem);memory_region_set_readonly (&s->mem, true);
@@ -668,7 +668,7 @@ static int afx_init1(SysBusDevice *dev) {AFXState *s =TCX_AFX (dev); -memory_region_init_ram (&s->mem,OBJECT (s),"sun4m.afx" ,4 ); +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.afx" ,4 );vmstate_register_ram_global (&s->mem);sysbus_init_mmio (dev, &s->mem);return 0 ;
@@ -742,7 +742,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4m.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4m.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);
@@ -784,7 +785,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4M_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4m.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4m.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;
hw/sparc64/sun4u.c +3 -2
@@ -686,7 +686,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4u.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4u.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);
@@ -729,7 +730,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4U_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4u.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4u.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;
hw/unicore32/puv3.c +1 -1
@@ -74,7 +74,7 @@ static void puv3_board_init(CPUUniCore32State *env, ram_addr_t ram_size)MemoryRegion *ram_memory =g_new (MemoryRegion,1 );/* SDRAM at address zero. */ -memory_region_init_ram (ram_memory,NULL ,"puv3.ram" , ram_size); +memory_region_init_ram_nofail (ram_memory,NULL ,"puv3.ram" , ram_size);vmstate_register_ram_global (ram_memory);memory_region_add_subregion (get_system_memory (),0 , ram_memory); }
hw/xtensa/sim.c +2 -2
@@ -79,12 +79,12 @@ static void xtensa_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"xtensa.sram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"xtensa.sram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"xtensa.rom" ,0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"xtensa.rom" ,0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0xfe000000 , rom);
hw/xtensa/xtfpga.c +3 -3
@@ -143,7 +143,7 @@ static void lx60_net_init(MemoryRegion *address_space, sysbus_mmio_get_region(s, 1)); ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,OBJECT (s),"open_eth.ram" ,16384 ); +memory_region_init_ram_nofail (ram,OBJECT (s),"open_eth.ram" ,16384 );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space, buffers, ram); }
@@ -205,7 +205,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"lx60.dram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"lx60.dram" , machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (system_memory,0 , ram);
@@ -254,7 +254,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)uint32_t cur_lowmem =QEMU_ALIGN_UP (lowmem_end /2 ,4096 ); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"lx60.sram" , board->sram_size); +memory_region_init_ram_nofail (rom,NULL ,"lx60.sram" , board->sram_size);vmstate_register_ram_global (rom);memory_region_add_subregion (system_memory,0xfe000000 , rom);
include/exec/memory.h +6 -6
@@ -321,18 +321,18 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, Error **errp);/** -* memory_region_init_ram: Initialize RAM memory region. Accesses into the -* region will modify memory directly. +* memory_region_init_ram_nofail: Initialize RAM memory region. Accesses into +* the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. */ -void memory_region_init_ram (MemoryRegion *mr, -struct Object *owner, -const char *name, -uint64_t size); +void memory_region_init_ram_nofail (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size);#ifdef __linux__/**
memory.c +4 -4
@@ -1174,10 +1174,10 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, mr->ram_addr =qemu_ram_alloc (size, mr, errp); } -void memory_region_init_ram (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size) +void memory_region_init_ram_nofail (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size) {Error *local_err =NULL ;
numa.c +2 -2
@@ -263,14 +263,14 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,if (err) {qerror_report_err (err);error_free (err); -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }#else fprintf (stderr,"-mem-path not supported on this host\n" );exit (1 );#endif }else { -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }vmstate_register_ram_global (mr); }
xen-hvm.c +1 -1
@@ -188,7 +188,7 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size,*/ block_len = (1ULL <<32 ) + *above_4g_mem_size; } -memory_region_init_ram (&ram_memory,NULL ,"xen.ram" , block_len); +memory_region_init_ram_nofail (&ram_memory,NULL ,"xen.ram" , block_len); *ram_memory_p = &ram_memory;vmstate_register_ram_global (&ram_memory);
Signature · 1 line
1.9.3
Re: [Qemu-devel] [PATCH v4 3/6] rename memory_region_init_ram to memory_region_init_ram_nofail
Quoted 66 lines · Hu Tao
Signed-off-by Hu Tao <[email protected]>--- hw/alpha/typhoon.c | 2 +- hw/arm/armv7m.c | 6 +++--- hw/arm/cubieboard.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 9 +++++---- hw/arm/highbank.c | 4 ++-- hw/arm/integratorcp.c | 5 +++-- hw/arm/kzm.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 5 +++-- hw/arm/omap1.c | 6 ++++-- hw/arm/omap2.c | 4 ++-- hw/arm/omap_sx1.c | 5 +++-- hw/arm/palm.c | 2 +- hw/arm/pxa2xx.c | 9 +++++---- hw/arm/realview.c | 7 ++++--- hw/arm/spitz.c | 2 +- hw/arm/strongarm.c | 3 ++- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 3 ++- hw/arm/vexpress.c | 10 +++++----- hw/arm/virt.c | 3 ++- hw/arm/xilinx_zynq.c | 4 ++-- hw/block/onenand.c | 2 +- hw/core/loader.c | 2 +- hw/cris/axis_dev88.c | 5 +++-- hw/display/cg3.c | 5 +++-- hw/display/qxl.c | 6 +++--- hw/display/sm501.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 5 +++-- hw/display/vga.c | 2 +- hw/display/vmware_vga.c | 3 ++- hw/i386/kvm/pci-assign.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_sysfw.c | 4 ++-- hw/input/milkymist-softusb.c | 4 ++-- hw/lm32/lm32_boards.c | 5 +++-- hw/lm32/milkymist.c | 3 ++- hw/m68k/an5206.c | 4 ++-- hw/m68k/dummy_m68k.c | 2 +- hw/m68k/mcf5208.c | 4 ++-- hw/microblaze/petalogix_ml605_mmu.c | 7 ++++--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 5 +++-- hw/mips/mips_fulong2e.c | 4 ++-- hw/mips/mips_jazz.c | 7 ++++--- hw/mips/mips_malta.c | 4 ++-- hw/mips/mips_mipssim.c | 4 ++-- hw/mips/mips_r4k.c | 4 ++-- hw/moxie/moxiesim.c | 4 ++-- hw/net/milkymist-minimac2.c | 4 ++-- hw/openrisc/openrisc_sim.c | 2 +- hw/pci-host/prep.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 7 ++++--- hw/ppc/ppc405_uc.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/shix.c | 6 +++--- hw/sparc/leon3.c | 4 ++-- hw/sparc/sun4m.c | 9 +++++----
Quoted 8 lines
hw/sparc64/sun4u.c | 5 +++-- hw/unicore32/puv3.c | 2 +- hw/xtensa/sim.c | 4 ++-- hw/xtensa/xtfpga.c | 6 +++--- include/exec/memory.h | 12 ++++++------ memory.c | 8 ++++---- numa.c | 4 ++-- xen-hvm.c | 2 +-
If you are commiting to a tree-wide fixup, I think its best to get the just Error ** version in use tree wide and just drop may_fail and no_fail variants.
The only reason to add a second fn would be to avoid having to touch all the call sites which you have now done.
Ultimately there should be one API used by all no_fail and may_fail call sites that accepts an Error **. "no fail" callsites pass in &error_abort. I think this is what you were suggesting in P1?
I don't see this change as being much more minimal and it's at the expense of correctness.
Regards,
Peter
Quoted 1,381 lines
72 files changed, 159 insertions(+), 136 deletions(-)hw/alpha/typhoon.c +1
-1@@ -843,7 +843,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,/* Main memory region, 0x00.0000.0000. Real hardware supports 32GB, but the address space hole reserved at this point is 8TB. */ -memory_region_init_ram (&s->ram_region,OBJECT (s),"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram_region,OBJECT (s),"ram" , ram_size);vmstate_register_ram_global (&s->ram_region);memory_region_add_subregion (addr_space,0 , &s->ram_region);hw/arm/armv7m.c +3
-3@@ -210,11 +210,11 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,#endif /* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"armv7m.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,0 , flash); -memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"armv7m.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x20000000 , sram);armv7m_bitband_init ();@@ -255,7 +255,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,/* Hack to map an additional page of ram at the top of the address space. This stops qemu complaining about executing code outside RAM when returning from an exception. */ -memory_region_init_ram (hack,NULL ,"armv7m.hack" ,0x1000 ); +memory_region_init_ram_nofail (hack,NULL ,"armv7m.hack" ,0x1000 );vmstate_register_ram_global (hack);memory_region_add_subregion (address_space_mem,0xfffff000 , hack);hw/arm/cubieboard.c +1
-1@@ -63,7 +63,7 @@ static void cubieboard_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"cubieboard.ram" , +memory_region_init_ram_nofail (&s->sdram,NULL ,"cubieboard.ram" , machine->ram_size);vmstate_register_ram_global (&s->sdram); memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,hw/arm/digic_boards.c +1
-1@@ -51,7 +51,7 @@ typedef struct DigicBoard {static void digic4_board_setup_ram (DigicBoardState *s,hwaddr ram_size) { -memory_region_init_ram (&s->ram,NULL ,"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram,NULL ,"ram" , ram_size);memory_region_add_subregion (get_system_memory (),0 , &s->ram);vmstate_register_ram_global (&s->ram); }hw/arm/exynos4210.c +5
-4@@ -247,7 +247,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->chipid_mem);/* Internal ROM */ -memory_region_init_ram (&s->irom_mem,NULL ,"exynos4210.irom" , +memory_region_init_ram_nofail (&s->irom_mem,NULL ,"exynos4210.irom" ,EXYNOS4210_IROM_SIZE );vmstate_register_ram_global (&s->irom_mem);memory_region_set_readonly (&s->irom_mem, true);@@ -263,7 +263,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->irom_alias_mem);/* Internal RAM */ -memory_region_init_ram (&s->iram_mem,NULL ,"exynos4210.iram" , +memory_region_init_ram_nofail (&s->iram_mem,NULL ,"exynos4210.iram" ,EXYNOS4210_IRAM_SIZE );vmstate_register_ram_global (&s->iram_mem); memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,@@ -272,14 +272,15 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,/* DRAM */ mem_size = ram_size;if (mem_size >EXYNOS4210_DRAM_MAX_SIZE ) { -memory_region_init_ram (&s->dram1_mem,NULL ,"exynos4210.dram1" , +memory_region_init_ram_nofail (&s->dram1_mem,NULL ,"exynos4210.dram1" , mem_size -EXYNOS4210_DRAM_MAX_SIZE );vmstate_register_ram_global (&s->dram1_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM1_BASE_ADDR , &s->dram1_mem); mem_size =EXYNOS4210_DRAM_MAX_SIZE ; } -memory_region_init_ram (&s->dram0_mem,NULL ,"exynos4210.dram0" , mem_size); +memory_region_init_ram_nofail (&s->dram0_mem,NULL ,"exynos4210.dram0" , + mem_size);vmstate_register_ram_global (&s->dram0_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM0_BASE_ADDR , &s->dram0_mem);hw/arm/highbank.c +2
-2@@ -255,12 +255,12 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) sysmem =get_system_memory (); dram =g_new (MemoryRegion,1 ); -memory_region_init_ram (dram,NULL ,"highbank.dram" , ram_size); +memory_region_init_ram_nofail (dram,NULL ,"highbank.dram" , ram_size);/* SDRAM at address zero. */ memory_region_add_subregion (sysmem,0 , dram); sysram =g_new (MemoryRegion,1 ); -memory_region_init_ram (sysram,NULL ,"highbank.sysram" ,0x8000 ); +memory_region_init_ram_nofail (sysram,NULL ,"highbank.sysram" ,0x8000 );memory_region_add_subregion (sysmem,0xfff88000 , sysram);if (bios_name !=NULL ) { sysboot_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);hw/arm/integratorcp.c +3
-2@@ -264,7 +264,8 @@ static int integratorcm_init(SysBusDevice *dev) s->cm_init =0x00000112 ; s->cm_refcnt_offset =muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ),24 ,1000 ); -memory_region_init_ram (&s->flash,OBJECT (s),"integrator.flash" ,0x100000 ); +memory_region_init_ram_nofail (&s->flash,OBJECT (s),"integrator.flash" , +0x100000 );vmstate_register_ram_global (&s->flash); memory_region_init_io(&s->iomem, OBJECT(s), &integratorcm_ops, s,@@ -485,7 +486,7 @@ static void integratorcp_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"integrator.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"integrator.ram" , ram_size);vmstate_register_ram_global (ram);/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ /* ??? RAM should repeat to fill physical memory space. */ hw/arm/kzm.c +2
-2@@ -97,14 +97,14 @@ static void kzm_init(MachineState *machine)/* On a real system, the first 16k is a `secure boot rom' */ -memory_region_init_ram (ram,NULL ,"kzm.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"kzm.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,KZM_RAMADDRESS , ram);memory_region_init_alias (ram_alias,NULL ,"ram.alias" , ram,0 , ram_size);memory_region_add_subregion (address_space_mem,0x88000000 , ram_alias); -memory_region_init_ram (sram,NULL ,"kzm.sram" ,0x4000 ); +memory_region_init_ram_nofail (sram,NULL ,"kzm.sram" ,0x4000 );memory_region_add_subregion (address_space_mem,0x1FFFC000 , sram); dev = sysbus_create_varargs("imx_avic", 0x68000000,hw/arm/mainstone.c +1
-1@@ -123,7 +123,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,/* Setup CPU & memory */ mpu =pxa270_init (address_space_mem, mainstone_binfo.ram_size, cpu_model); -memory_region_init_ram (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/musicpal.c +3
-2@@ -1601,11 +1601,12 @@ static void musicpal_init(MachineState *machine) }/* For now we use a fixed - the original - RAM size */ -memory_region_init_ram (ram,NULL ,"musicpal.ram" ,MP_RAM_DEFAULT_SIZE ); +memory_region_init_ram_nofail (ram,NULL ,"musicpal.ram" , +MP_RAM_DEFAULT_SIZE );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram); -memory_region_init_ram (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE ); +memory_region_init_ram_nofail (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,MP_SRAM_BASE , sram);hw/arm/omap1.c +4
-2@@ -3854,10 +3854,12 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->emiff_ram,NULL ,"omap1.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->emiff_ram,NULL ,"omap1.dram" , + s->sdram_size);vmstate_register_ram_global (&s->emiff_ram);memory_region_add_subregion (system_memory,OMAP_EMIFF_BASE , &s->emiff_ram); -memory_region_init_ram (&s->imif_ram,NULL ,"omap1.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->imif_ram,NULL ,"omap1.sram" , + s->sram_size);vmstate_register_ram_global (&s->imif_ram);memory_region_add_subregion (system_memory,OMAP_IMIF_BASE , &s->imif_ram);hw/arm/omap2.c +2
-2@@ -2266,10 +2266,10 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->sdram,NULL ,"omap2.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"omap2.dram" , s->sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,OMAP2_Q2_BASE , &s->sdram); -memory_region_init_ram (&s->sram,NULL ,"omap2.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->sram,NULL ,"omap2.sram" , s->sram_size);vmstate_register_ram_global (&s->sram);memory_region_add_subregion (sysmem,OMAP2_SRAM_BASE , &s->sram);hw/arm/omap_sx1.c +3
-2@@ -122,7 +122,7 @@ static void sx1_init(MachineState *machine, const int version) machine->cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"omap_sx1.flash0-0" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"omap_sx1.flash0-0" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space,OMAP_CS0_BASE , flash);@@ -164,7 +164,8 @@ static void sx1_init(MachineState *machine, const int version)if ((version ==1 ) && (dinfo =drive_get (IF_PFLASH ,0 , fl_idx)) !=NULL ) { -memory_region_init_ram (flash_1,NULL ,"omap_sx1.flash1-0" , flash1_size); +memory_region_init_ram_nofail (flash_1,NULL ,"omap_sx1.flash1-0" , + flash1_size);vmstate_register_ram_global (flash_1);memory_region_set_readonly (flash_1, true);memory_region_add_subregion (address_space,OMAP_CS1_BASE , flash_1);hw/arm/palm.c +1
-1@@ -212,7 +212,7 @@ static void palmte_init(MachineState *machine) mpu =omap310_mpu_init (address_space_mem, sdram_size, cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"palmte.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"palmte.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,OMAP_CS0_BASE , flash);hw/arm/pxa2xx.c +5
-4@@ -2055,10 +2055,11 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa270.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa270.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa270.internal" ,0x40000 ); +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa270.internal" , +0x40000 );vmstate_register_ram_global (&s->internal);memory_region_add_subregion (address_space,PXA2XX_INTERNAL_BASE , &s->internal);@@ -2186,10 +2187,10 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa255.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa255.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa255.internal" , +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa255.internal" ,PXA2XX_INTERNAL_SIZE );vmstate_register_ram_global (&s->internal); memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE,hw/arm/realview.c +4
-3@@ -137,12 +137,13 @@ static void realview_init(MachineState *machine,/* Core tile RAM. */ low_ram_size = ram_size -0x20000000 ; ram_size =0x20000000 ; -memory_region_init_ram (ram_lo,NULL ,"realview.lowmem" , low_ram_size); +memory_region_init_ram_nofail (ram_lo,NULL ,"realview.lowmem" , + low_ram_size);vmstate_register_ram_global (ram_lo);memory_region_add_subregion (sysmem,0x20000000 , ram_lo); } -memory_region_init_ram (ram_hi,NULL ,"realview.highmem" , ram_size); +memory_region_init_ram_nofail (ram_hi,NULL ,"realview.highmem" , ram_size);vmstate_register_ram_global (ram_hi); low_ram_size = ram_size;if (low_ram_size >0x10000000 )@@ -337,7 +338,7 @@ static void realview_init(MachineState *machine,startup code. I guess this works on real hardware because the BootROM happens to be in ROM/flash or in memory that isn't clobbered until after Linux boots the secondary CPUs. */ -memory_region_init_ram (ram_hack,NULL ,"realview.hack" ,0x1000 ); +memory_region_init_ram_nofail (ram_hack,NULL ,"realview.hack" ,0x1000 );vmstate_register_ram_global (ram_hack);memory_region_add_subregion (sysmem,SMP_BOOT_ADDR , ram_hack);hw/arm/spitz.c +1
-1@@ -912,7 +912,7 @@ static void spitz_common_init(MachineState *machine,sl_flash_register (mpu, (model == spitz) ?FLASH_128M :FLASH_1024M ); -memory_region_init_ram (rom,NULL ,"spitz.rom" ,SPITZ_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"spitz.rom" ,SPITZ_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/strongarm.c +2
-1@@ -1604,7 +1604,8 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"strongarm.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"strongarm.sdram" , + sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,SA_SDCS0 , &s->sdram);hw/arm/tosa.c +1
-1@@ -228,7 +228,7 @@ static void tosa_init(MachineState *machine) mpu =pxa255_init (address_space_mem, tosa_binfo.ram_size); -memory_region_init_ram (rom,NULL ,"tosa.rom" ,TOSA_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"tosa.rom" ,TOSA_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/versatilepb.c +2
-1@@ -198,7 +198,8 @@ static void versatile_init(MachineState *machine, int board_id)fprintf (stderr,"Unable to find CPU definition\n" );exit (1 ); } -memory_region_init_ram (ram,NULL ,"versatile.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"versatile.ram" , + machine->ram_size);vmstate_register_ram_global (ram);/* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */ hw/arm/vexpress.c +5
-5@@ -252,7 +252,7 @@ static void a9_daughterboard_init(const VEDBoardInfo *daughterboard,exit (1 ); } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram); low_ram_size = ram_size;if (low_ram_size >0x4000000 ) {@@ -346,7 +346,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard, } } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram);/* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */ memory_region_add_subregion (sysmem,0x80000000 , ram);@@ -364,7 +364,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard,/* 0x2b060000: SP805 watchdog: not modelled */ /* 0x2b0a0000: PL341 dynamic memory controller: not modelled */ /* 0x2e000000: system SRAM */ -memory_region_init_ram (sram,NULL ,"vexpress.a15sram" ,0x10000 ); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.a15sram" ,0x10000 );vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0x2e000000 , sram);@@ -634,12 +634,12 @@ static void vexpress_common_init(VEDBoardInfo *daughterboard, } sram_size =0x2000000 ; -memory_region_init_ram (sram,NULL ,"vexpress.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem, map[VE_SRAM ], sram); vram_size =0x800000 ; -memory_region_init_ram (vram,NULL ,"vexpress.vram" , vram_size); +memory_region_init_ram_nofail (vram,NULL ,"vexpress.vram" , vram_size);vmstate_register_ram_global (vram);memory_region_add_subregion (sysmem, map[VE_VIDEORAM ], vram);hw/arm/virt.c +2
-1@@ -489,7 +489,8 @@ static void machvirt_init(MachineState *machine)fdt_add_cpu_nodes (vbi);fdt_add_psci_node (vbi); -memory_region_init_ram (ram,NULL ,"mach-virt.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mach-virt.ram" , + machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem, vbi->memmap[VIRT_MEM ].base, ram);hw/arm/xilinx_zynq.c +2
-2@@ -149,12 +149,12 @@ static void zynq_init(MachineState *machine) }/* DDR remapped to address zero. */ -memory_region_init_ram (ext_ram,NULL ,"zynq.ext_ram" , ram_size); +memory_region_init_ram_nofail (ext_ram,NULL ,"zynq.ext_ram" , ram_size);vmstate_register_ram_global (ext_ram);memory_region_add_subregion (address_space_mem,0 , ext_ram);/* 256K of on-chip memory */ -memory_region_init_ram (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 ); +memory_region_init_ram_nofail (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 );vmstate_register_ram_global (ocm_ram);memory_region_add_subregion (address_space_mem,0xFFFC0000 , ocm_ram);hw/block/onenand.c +1
-1@@ -788,7 +788,7 @@ static int onenand_initfn(SysBusDevice *sbd) } s->otp =memset (g_malloc ((64 +2 ) <<PAGE_SHIFT ),0xff , (64 +2 ) <<PAGE_SHIFT ); -memory_region_init_ram (&s->ram,OBJECT (s),"onenand.ram" , +memory_region_init_ram_nofail (&s->ram,OBJECT (s),"onenand.ram" ,0xc000 << s->shift);vmstate_register_ram_global (&s->ram); ram =memory_region_get_ram_ptr (&s->ram);hw/core/loader.c +1
-1@@ -632,7 +632,7 @@ static void *rom_set_mr(Rom *rom, Object *owner, const char *name)void *data; rom->mr =g_malloc (sizeof (*rom->mr)); -memory_region_init_ram (rom->mr, owner, name, rom->datasize); +memory_region_init_ram_nofail (rom->mr, owner, name, rom->datasize);memory_region_set_readonly (rom->mr, true);vmstate_register_ram_global (rom->mr);hw/cris/axis_dev88.c +3
-2@@ -270,13 +270,14 @@ void axisdev88_init(MachineState *machine) env = &cpu->env;/* allocate RAM */ -memory_region_init_ram (phys_ram,NULL ,"axisdev88.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"axisdev88.ram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem,0x40000000 , phys_ram);/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the internal memory. */ -memory_region_init_ram (phys_intmem,NULL ,"axisdev88.chipram" ,INTMEM_SIZE ); +memory_region_init_ram_nofail (phys_intmem,NULL ,"axisdev88.chipram" , +INTMEM_SIZE );vmstate_register_ram_global (phys_intmem);memory_region_add_subregion (address_space_mem,0x38000000 , phys_intmem);hw/display/cg3.c +3
-2@@ -279,7 +279,8 @@ static void cg3_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);CG3State *s =CG3 (obj); -memory_region_init_ram (&s->rom,NULL ,"cg3.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"cg3.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);@@ -306,7 +307,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp) } } -memory_region_init_ram (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size);vmstate_register_ram_global (&s->vram_mem);sysbus_init_mmio (sbd, &s->vram_mem);hw/display/qxl.c +3
-3@@ -1978,14 +1978,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)pci_set_byte (&config[PCI_INTERRUPT_PIN ],1 ); qxl->rom_size =qxl_rom_size (); -memory_region_init_ram (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , +memory_region_init_ram_nofail (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , qxl->rom_size);vmstate_register_ram (&qxl->rom_bar, &qxl->pci.qdev);init_qxl_rom (qxl);init_qxl_ram (qxl); qxl->guest_surfaces.cmds =g_new0 (QXLPHYSICAL , qxl->ssd.num_surfaces); -memory_region_init_ram (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , +memory_region_init_ram_nofail (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , qxl->vram_size);vmstate_register_ram (&qxl->vram_bar, &qxl->pci.qdev); memory_region_init_alias(&qxl->vram32_bar, OBJECT(qxl), "qxl.vram32",@@ -2093,7 +2093,7 @@ static int qxl_init_secondary(PCIDevice *dev) qxl->id = device_id++;qxl_init_ramsize (qxl); -memory_region_init_ram (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , +memory_region_init_ram_nofail (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , qxl->vga.vram_size);vmstate_register_ram (&qxl->vga.vram, &qxl->pci.qdev); qxl->vga.vram_ptr =memory_region_get_ram_ptr (&qxl->vga.vram);hw/display/sm501.c +1
-1@@ -1409,7 +1409,7 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t base, s->dc_crt_control =0x00010000 ;/* allocate local memory */ -memory_region_init_ram (&s->local_mem_region,NULL ,"sm501.local" , +memory_region_init_ram_nofail (&s->local_mem_region,NULL ,"sm501.local" , local_mem_bytes);vmstate_register_ram_global (&s->local_mem_region); s->local_mem =memory_region_get_ram_ptr (&s->local_mem_region);hw/display/tc6393xb.c +1
-1@@ -581,7 +581,7 @@ TC6393xbState *tc6393xb_init(MemoryRegion *sysmem, uint32_t base, qemu_irq irq)memory_region_init_io (&s->iomem,NULL , &tc6393xb_ops, s,"tc6393xb" ,0x10000 );memory_region_add_subregion (sysmem, base, &s->iomem); -memory_region_init_ram (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 ); +memory_region_init_ram_nofail (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 );vmstate_register_ram_global (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);memory_region_add_subregion (sysmem, base +0x100000 , &s->vram);hw/display/tcx.c +3
-2@@ -535,7 +535,8 @@ static void tcx_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);TCXState *s =TCX (obj); -memory_region_init_ram (&s->rom,NULL ,"tcx.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"tcx.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);@@ -566,7 +567,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)uint8_t *vram_base;char *fcode_filename; -memory_region_init_ram (&s->vram_mem,OBJECT (s),"tcx.vram" , +memory_region_init_ram_nofail (&s->vram_mem,OBJECT (s),"tcx.vram" , s->vram_size * (1 +4 +4 ));vmstate_register_ram_global (&s->vram_mem); vram_base =memory_region_get_ram_ptr (&s->vram_mem);hw/display/vga.c +1
-1@@ -2291,7 +2291,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) s->vram_size_mb = s->vram_size >>20 ; s->is_vbe_vmstate =1 ; -memory_region_init_ram (&s->vram, obj,"vga.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram, obj,"vga.vram" , s->vram_size);vmstate_register_ram (&s->vram, global_vmstate ?NULL :DEVICE (obj));xen_register_framebuffer (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);hw/display/vmware_vga.c +2
-1@@ -1201,7 +1201,8 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, s->vga.con =graphic_console_init (dev,0 , &vmsvga_ops, s); s->fifo_size =SVGA_FIFO_SIZE ; -memory_region_init_ram (&s->fifo_ram,NULL ,"vmsvga.fifo" , s->fifo_size); +memory_region_init_ram_nofail (&s->fifo_ram,NULL ,"vmsvga.fifo" , + s->fifo_size);vmstate_register_ram_global (&s->fifo_ram); s->fifo_ptr =memory_region_get_ram_ptr (&s->fifo_ram);hw/i386/kvm/pci-assign.c +1
-1@@ -1943,7 +1943,7 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (dev))); -memory_region_init_ram (&dev->dev.rom,OBJECT (dev), name, st.st_size); +memory_region_init_ram_nofail (&dev->dev.rom,OBJECT (dev), name, st.st_size);vmstate_register_ram (&dev->dev.rom, &dev->dev.qdev); ptr =memory_region_get_ram_ptr (&dev->dev.rom);memset (ptr,0xff , st.st_size);hw/i386/pc.c +1
-1@@ -1272,7 +1272,7 @@ FWCfgState *pc_memory_init(MachineState *machine,pc_system_firmware_init (rom_memory, guest_info->isapc_ram_fw); option_rom_mr =g_malloc (sizeof (*option_rom_mr)); -memory_region_init_ram (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE ); +memory_region_init_ram_nofail (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE );vmstate_register_ram_global (option_rom_mr); memory_region_add_subregion_overlap(rom_memory, PC_ROM_MIN_VGA,hw/i386/pc_sysfw.c +2
-2@@ -55,7 +55,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory,/* map the last 128KB of the BIOS in ISA space */ isa_bios_size =MIN (flash_size,128 *1024 ); isa_bios =g_malloc (sizeof (*isa_bios)); -memory_region_init_ram (isa_bios,NULL ,"isa-bios" , isa_bios_size); +memory_region_init_ram_nofail (isa_bios,NULL ,"isa-bios" , isa_bios_size);vmstate_register_ram_global (isa_bios); memory_region_add_subregion_overlap(rom_memory, 0x100000 - isa_bios_size,@@ -192,7 +192,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) goto bios_error; } bios =g_malloc (sizeof (*bios)); -memory_region_init_ram (bios,NULL ,"pc.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"pc.bios" , bios_size);vmstate_register_ram_global (bios);if (!isapc_ram_fw) {memory_region_set_readonly (bios, true);hw/input/milkymist-softusb.c +2
-2@@ -249,12 +249,12 @@ static int milkymist_softusb_init(SysBusDevice *dev)sysbus_init_mmio (dev, &s->regs_region);/* register pmem and dmem */ -memory_region_init_ram (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , +memory_region_init_ram_nofail (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , s->pmem_size);vmstate_register_ram_global (&s->pmem); s->pmem_ptr =memory_region_get_ram_ptr (&s->pmem);sysbus_init_mmio (dev, &s->pmem); -memory_region_init_ram (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , +memory_region_init_ram_nofail (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , s->dmem_size);vmstate_register_ram_global (&s->dmem); s->dmem_ptr =memory_region_get_ram_ptr (&s->dmem);hw/lm32/lm32_boards.c +3
-2@@ -111,7 +111,7 @@ static void lm32_evr_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_evr.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_evr.sdram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);@@ -213,7 +213,8 @@ static void lm32_uclinux_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_uclinux.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_uclinux.sdram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);hw/lm32/milkymist.c +2
-1@@ -118,7 +118,8 @@ milkymist_init(MachineState *machine)cpu_lm32_set_phys_msb_ignore (env,1 ); -memory_region_init_ram (phys_sdram,NULL ,"milkymist.sdram" , sdram_size); +memory_region_init_ram_nofail (phys_sdram,NULL ,"milkymist.sdram" , + sdram_size);vmstate_register_ram_global (phys_sdram);memory_region_add_subregion (address_space_mem, sdram_base, phys_sdram);hw/m68k/an5206.c +2
-2@@ -50,12 +50,12 @@ static void an5206_init(MachineState *machine) env->rambar0 =AN5206_RAMBAR_ADDR |1 ;/* DRAM at address zero */ -memory_region_init_ram (ram,NULL ,"an5206.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"an5206.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"an5206.sram" ,512 ); +memory_region_init_ram_nofail (sram,NULL ,"an5206.sram" ,512 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,AN5206_RAMBAR_ADDR , sram);hw/m68k/dummy_m68k.c +1
-1@@ -40,7 +40,7 @@ static void dummy_m68k_init(MachineState *machine) env->vbr =0 ;/* RAM at address zero */ -memory_region_init_ram (ram,NULL ,"dummy_m68k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"dummy_m68k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);hw/m68k/mcf5208.c +2
-2@@ -218,12 +218,12 @@ static void mcf5208evb_init(MachineState *machine)/* TODO: Configure BARs. */ /* DRAM at 0x40000000 */ -memory_region_init_ram (ram,NULL ,"mcf5208.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mcf5208.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"mcf5208.sram" ,16384 ); +memory_region_init_ram_nofail (sram,NULL ,"mcf5208.sram" ,16384 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x80000000 , sram);hw/microblaze/petalogix_ml605_mmu.c +4
-3@@ -99,12 +99,13 @@ petalogix_ml605_init(MachineState *machine)object_property_set_bool (OBJECT (cpu), true,"realized" , &error_abort);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL ,"petalogix_ml605.lmb_bram" , -LMB_BRAM_SIZE ); +memory_region_init_ram_nofail (phys_lmb_bram,NULL , +"petalogix_ml605.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (address_space_mem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_ml605.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_ml605.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ddr_base, phys_ram);hw/microblaze/petalogix_s3adsp1800_mmu.c +3
-2@@ -80,12 +80,13 @@ petalogix_s3adsp1800_init(MachineState *machine) cpu =cpu_mb_init (cpu_model);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL , +memory_region_init_ram_nofail (phys_lmb_bram,NULL ,"petalogix_s3adsp1800.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (sysmem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (sysmem, ddr_base, phys_ram);hw/mips/mips_fulong2e.c +2
-2@@ -302,9 +302,9 @@ static void mips_fulong2e_init(MachineState *machine) bios_size =1024 *1024 ;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"fulong2e.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"fulong2e.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"fulong2e.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"fulong2e.bios" , bios_size);vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);hw/mips/mips_jazz.c +4
-3@@ -179,11 +179,12 @@ static void mips_jazz_init(MemoryRegion *address_space, cc->do_unassigned_access = mips_jazz_do_unassigned_access;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"mips_jazz.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_jazz.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space,0 , ram); -memory_region_init_ram (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_jazz.bios" , +MAGNUM_BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true); memory_region_init_alias(bios2, NULL, "mips_jazz.bios", bios,@@ -244,7 +245,7 @@ static void mips_jazz_init(MemoryRegion *address_space, {/* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr =g_new (MemoryRegion,1 ); -memory_region_init_ram (rom_mr,NULL ,"g364fb.rom" ,0x80000 ); +memory_region_init_ram_nofail (rom_mr,NULL ,"g364fb.rom" ,0x80000 );vmstate_register_ram_global (rom_mr);memory_region_set_readonly (rom_mr, true);uint8_t *rom =memory_region_get_ram_ptr (rom_mr);hw/mips/mips_malta.c +2
-2@@ -992,7 +992,7 @@ void mips_malta_init(MachineState *machine) }/* register RAM at high address where it is undisturbed by IO */ -memory_region_init_ram (ram_high,NULL ,"mips_malta.ram" , ram_size); +memory_region_init_ram_nofail (ram_high,NULL ,"mips_malta.ram" , ram_size);vmstate_register_ram_global (ram_high);memory_region_add_subregion (system_memory,0x80000000 , ram_high);@@ -1116,7 +1116,7 @@ void mips_malta_init(MachineState *machine)* handled by an overlapping region as the resulting ROM code subpage * regions are not executable. */ -memory_region_init_ram (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE );if (!rom_copy (memory_region_get_ram_ptr (bios_copy),FLASH_ADDRESS ,BIOS_SIZE )) { memcpy(memory_region_get_ram_ptr(bios_copy),hw/mips/mips_mipssim.c +2
-2@@ -171,9 +171,9 @@ mips_mipssim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"mips_mipssim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_mipssim.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);hw/mips/mips_r4k.c +2
-2@@ -204,7 +204,7 @@ void mips_r4k_init(MachineState *machine) ((unsigned int)ram_size / (1 << 20)));exit (1 ); } -memory_region_init_ram (ram,NULL ,"mips_r4k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_r4k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);@@ -231,7 +231,7 @@ void mips_r4k_init(MachineState *machine)#endif if ((bios_size >0 ) && (bios_size <=BIOS_SIZE )) { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),0x1fc00000 , bios);hw/moxie/moxiesim.c +2
-2@@ -123,11 +123,11 @@ static void moxiesim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, cpu);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"moxiesim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"moxiesim.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem, ram_base, ram); -memory_region_init_ram (rom,NULL ,"moxie.rom" ,128 *0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"moxie.rom" ,128 *0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0x1000 , rom);hw/net/milkymist-minimac2.c +2
-2@@ -471,8 +471,8 @@ static int milkymist_minimac2_init(SysBusDevice *sbd)sysbus_init_mmio (sbd, &s->regs_region);/* register buffers memory */ -memory_region_init_ram (&s->buffers,OBJECT (dev),"milkymist-minimac2.buffers" , - buffers_size); +memory_region_init_ram_nofail (&s->buffers,OBJECT (dev), +"milkymist-minimac2.buffers" , buffers_size);vmstate_register_ram_global (&s->buffers); s->rx0_buf =memory_region_get_ram_ptr (&s->buffers); s->rx1_buf = s->rx0_buf +MINIMAC2_BUFFER_SIZE ;hw/openrisc/openrisc_sim.c +1
-1@@ -114,7 +114,7 @@ static void openrisc_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"openrisc.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"openrisc.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram);hw/pci-host/prep.c +1
-1@@ -299,7 +299,7 @@ static int raven_init(PCIDevice *d) d->config[0x0D ] =0x10 ;// latency_timer d->config[0x34 ] =0x00 ;// capabilities_pointer -memory_region_init_ram (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE );memory_region_set_readonly (&s->bios, true);memory_region_add_subregion (get_system_memory (), (uint32_t )(-BIOS_SIZE ), &s->bios);hw/pci/pci.c +1
-1@@ -1974,7 +1974,7 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (pdev))); } pdev->has_rom = true; -memory_region_init_ram (&pdev->rom,OBJECT (pdev), name, size); +memory_region_init_ram_nofail (&pdev->rom,OBJECT (pdev), name, size);vmstate_register_ram (&pdev->rom, &pdev->qdev); ptr =memory_region_get_ram_ptr (&pdev->rom);load_image (path, ptr);hw/ppc/mac_newworld.c +1
-1@@ -204,7 +204,7 @@ static void ppc_core99_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )hw/ppc/mac_oldworld.c +1
-1@@ -135,7 +135,7 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )hw/ppc/ppc405_boards.c +4
-3@@ -214,7 +214,7 @@ static void ref405ep_init(MachineState *machine) 33333333, &pic, kernel_filename == NULL ? 0 : 1);/* allocate SRAM */ sram_size =512 *1024 ; -memory_region_init_ram (sram,NULL ,"ef405ep.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"ef405ep.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0xFFF00000 , sram);/* allocate and load BIOS */ @@ -246,7 +246,7 @@ static void ref405ep_init(MachineState *machine)printf ("Load BIOS from file\n" );#endif bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )@@ -572,7 +572,8 @@ static void taihu_405ep_init(MachineState *machine)if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"taihu_405ep.bios" , +BIOS_SIZE );vmstate_register_ram_global (bios); filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);if (filename) {hw/ppc/ppc405_uc.c +1
-1@@ -974,7 +974,7 @@ static void ppc405_ocm_init(CPUPPCState *env) ocm =g_malloc0 (sizeof (ppc405_ocm_t));/* XXX: Size is 4096 or 0x04000000 */ -memory_region_init_ram (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 ); +memory_region_init_ram_nofail (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 );vmstate_register_ram_global (&ocm->isarc_ram);memory_region_init_alias (&ocm->dsarc_ram,NULL ,"ppc405.dsarc" , &ocm->isarc_ram,0 ,4096 );hw/s390x/s390-virtio-ccw.c +1
-1@@ -110,7 +110,7 @@ static void ccw_init(MachineState *machine)virtio_ccw_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);hw/s390x/s390-virtio.c +1
-1@@ -256,7 +256,7 @@ static void s390_init(MachineState *machine)s390_virtio_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);hw/sh4/r2d.c +1
-1@@ -255,7 +255,7 @@ static void r2d_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate memory space */ -memory_region_init_ram (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE ); +memory_region_init_ram_nofail (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE );vmstate_register_ram_global (sdram);memory_region_add_subregion (address_space_mem,SDRAM_BASE , sdram);/* Register peripherals */ hw/sh4/shix.c +3
-3@@ -59,14 +59,14 @@ static void shix_init(MachineState *machine) }/* Allocate memory space */ -memory_region_init_ram (rom,NULL ,"shix.rom" ,0x4000 ); +memory_region_init_ram_nofail (rom,NULL ,"shix.rom" ,0x4000 );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (sysmem,0x00000000 , rom); -memory_region_init_ram (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 );vmstate_register_ram_global (&sdram[0 ]);memory_region_add_subregion (sysmem,0x08000000 , &sdram[0 ]); -memory_region_init_ram (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 );vmstate_register_ram_global (&sdram[1 ]);memory_region_add_subregion (sysmem,0x0c000000 , &sdram[1 ]);hw/sparc/leon3.c +2
-2@@ -151,13 +151,13 @@ static void leon3_generic_hw_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"leon3.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"leon3.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Allocate BIOS */ prom_size =8 *1024 *1024 ;/* 8Mb */ -memory_region_init_ram (prom,NULL ,"Leon3.bios" , prom_size); +memory_region_init_ram_nofail (prom,NULL ,"Leon3.bios" , prom_size);vmstate_register_ram_global (prom);memory_region_set_readonly (prom, true);memory_region_add_subregion (address_space_mem,0x00000000 , prom);hw/sparc/sun4m.c +5
-4@@ -620,7 +620,7 @@ static int idreg_init1(SysBusDevice *dev) {IDRegState *s =MACIO_ID_REGISTER (dev); -memory_region_init_ram (&s->mem,OBJECT (s), +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.idreg" ,sizeof (idreg_data));vmstate_register_ram_global (&s->mem);memory_region_set_readonly (&s->mem, true);@@ -668,7 +668,7 @@ static int afx_init1(SysBusDevice *dev) {AFXState *s =TCX_AFX (dev); -memory_region_init_ram (&s->mem,OBJECT (s),"sun4m.afx" ,4 ); +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.afx" ,4 );vmstate_register_ram_global (&s->mem);sysbus_init_mmio (dev, &s->mem);return 0 ;@@ -742,7 +742,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4m.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4m.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);@@ -784,7 +785,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4M_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4m.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4m.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;hw/sparc64/sun4u.c +3
-2@@ -686,7 +686,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4u.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4u.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);@@ -729,7 +730,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4U_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4u.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4u.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;hw/unicore32/puv3.c +1
-1@@ -74,7 +74,7 @@ static void puv3_board_init(CPUUniCore32State *env, ram_addr_t ram_size)MemoryRegion *ram_memory =g_new (MemoryRegion,1 );/* SDRAM at address zero. */ -memory_region_init_ram (ram_memory,NULL ,"puv3.ram" , ram_size); +memory_region_init_ram_nofail (ram_memory,NULL ,"puv3.ram" , ram_size);vmstate_register_ram_global (ram_memory);memory_region_add_subregion (get_system_memory (),0 , ram_memory); }hw/xtensa/sim.c +2
-2@@ -79,12 +79,12 @@ static void xtensa_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"xtensa.sram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"xtensa.sram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"xtensa.rom" ,0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"xtensa.rom" ,0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0xfe000000 , rom);hw/xtensa/xtfpga.c +3
-3@@ -143,7 +143,7 @@ static void lx60_net_init(MemoryRegion *address_space, sysbus_mmio_get_region(s, 1)); ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,OBJECT (s),"open_eth.ram" ,16384 ); +memory_region_init_ram_nofail (ram,OBJECT (s),"open_eth.ram" ,16384 );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space, buffers, ram); }@@ -205,7 +205,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"lx60.dram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"lx60.dram" , machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (system_memory,0 , ram);@@ -254,7 +254,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)uint32_t cur_lowmem =QEMU_ALIGN_UP (lowmem_end /2 ,4096 ); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"lx60.sram" , board->sram_size); +memory_region_init_ram_nofail (rom,NULL ,"lx60.sram" , board->sram_size);vmstate_register_ram_global (rom);memory_region_add_subregion (system_memory,0xfe000000 , rom);include/exec/memory.h +6
-6@@ -321,18 +321,18 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, Error **errp);/** -* memory_region_init_ram: Initialize RAM memory region. Accesses into the -* region will modify memory directly. +* memory_region_init_ram_nofail: Initialize RAM memory region. Accesses into +* the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. */ -void memory_region_init_ram (MemoryRegion *mr, -struct Object *owner, -const char *name, -uint64_t size); +void memory_region_init_ram_nofail (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size);#ifdef __linux__/** memory.c +4
-4@@ -1174,10 +1174,10 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, mr->ram_addr =qemu_ram_alloc (size, mr, errp); } -void memory_region_init_ram (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size) +void memory_region_init_ram_nofail (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size) {Error *local_err =NULL ;numa.c +2
-2@@ -263,14 +263,14 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,if (err) {qerror_report_err (err);error_free (err); -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }#else fprintf (stderr,"-mem-path not supported on this host\n" );exit (1 );#endif }else { -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }vmstate_register_ram_global (mr); }xen-hvm.c +1
-2@@ -188,7 +188,7 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size,*/ block_len = (1ULL <<32 ) + *above_4g_mem_size; } -memory_region_init_ram (&ram_memory,NULL ,"xen.ram" , block_len); +memory_region_init_ram_nofail (&ram_memory,NULL ,"xen.ram" , block_len); *ram_memory_p = &ram_memory;vmstate_register_ram_global (&ram_memory); --1.9.3
Re: [Qemu-devel] [PATCH v4 3/6] rename memory_region_init_ram to memory_region_init_ram_nofail
Quoted 76 lines · Peter Crosthwaite
Quoted 66 lines · Hu Tao
Signed-off-by Hu Tao <[email protected]>--- hw/alpha/typhoon.c | 2 +- hw/arm/armv7m.c | 6 +++--- hw/arm/cubieboard.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 9 +++++---- hw/arm/highbank.c | 4 ++-- hw/arm/integratorcp.c | 5 +++-- hw/arm/kzm.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 5 +++-- hw/arm/omap1.c | 6 ++++-- hw/arm/omap2.c | 4 ++-- hw/arm/omap_sx1.c | 5 +++-- hw/arm/palm.c | 2 +- hw/arm/pxa2xx.c | 9 +++++---- hw/arm/realview.c | 7 ++++--- hw/arm/spitz.c | 2 +- hw/arm/strongarm.c | 3 ++- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 3 ++- hw/arm/vexpress.c | 10 +++++----- hw/arm/virt.c | 3 ++- hw/arm/xilinx_zynq.c | 4 ++-- hw/block/onenand.c | 2 +- hw/core/loader.c | 2 +- hw/cris/axis_dev88.c | 5 +++-- hw/display/cg3.c | 5 +++-- hw/display/qxl.c | 6 +++--- hw/display/sm501.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 5 +++-- hw/display/vga.c | 2 +- hw/display/vmware_vga.c | 3 ++- hw/i386/kvm/pci-assign.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_sysfw.c | 4 ++-- hw/input/milkymist-softusb.c | 4 ++-- hw/lm32/lm32_boards.c | 5 +++-- hw/lm32/milkymist.c | 3 ++- hw/m68k/an5206.c | 4 ++-- hw/m68k/dummy_m68k.c | 2 +- hw/m68k/mcf5208.c | 4 ++-- hw/microblaze/petalogix_ml605_mmu.c | 7 ++++--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 5 +++-- hw/mips/mips_fulong2e.c | 4 ++-- hw/mips/mips_jazz.c | 7 ++++--- hw/mips/mips_malta.c | 4 ++-- hw/mips/mips_mipssim.c | 4 ++-- hw/mips/mips_r4k.c | 4 ++-- hw/moxie/moxiesim.c | 4 ++-- hw/net/milkymist-minimac2.c | 4 ++-- hw/openrisc/openrisc_sim.c | 2 +- hw/pci-host/prep.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 7 ++++--- hw/ppc/ppc405_uc.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/shix.c | 6 +++--- hw/sparc/leon3.c | 4 ++-- hw/sparc/sun4m.c | 9 +++++----Quoted 8 lines
hw/sparc64/sun4u.c | 5 +++-- hw/unicore32/puv3.c | 2 +- hw/xtensa/sim.c | 4 ++-- hw/xtensa/xtfpga.c | 6 +++--- include/exec/memory.h | 12 ++++++------ memory.c | 8 ++++---- numa.c | 4 ++-- xen-hvm.c | 2 +-
Quoted 3 lines
If you are commiting to a tree-wide fixup, I think its best to get the just Error ** version in use tree wide and just drop
may_failandno_failvariants.
Agreed.
Quoted 3 lines
The only reason to add a second fn would be to avoid having to touch all the call sites which you have now done.
Yes.
Quoted 4 lines
Ultimately there should be one API used by all
no_failandmay_failcall sites that accepts an Error **. "no fail" callsites pass in&error_abort. I think this is what you were suggesting in P1?
I didn't think error_abort. So it's simpler to first add Error ** to API, update call sites to pass in &error_abort. This way we don't introduce may_fail or no_fail at all.
Quoted 1,388 lines
I don't see this change as being much more minimal and it's at the expense of correctness.
Regards,
PeterQuoted 1,381 lines
72 files changed, 159 insertions(+), 136 deletions(-)hw/alpha/typhoon.c +1
-1@@ -843,7 +843,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,/* Main memory region, 0x00.0000.0000. Real hardware supports 32GB, but the address space hole reserved at this point is 8TB. */ -memory_region_init_ram (&s->ram_region,OBJECT (s),"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram_region,OBJECT (s),"ram" , ram_size);vmstate_register_ram_global (&s->ram_region);memory_region_add_subregion (addr_space,0 , &s->ram_region);hw/arm/armv7m.c +3
-3@@ -210,11 +210,11 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,#endif /* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"armv7m.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,0 , flash); -memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"armv7m.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x20000000 , sram);armv7m_bitband_init ();@@ -255,7 +255,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,/* Hack to map an additional page of ram at the top of the address space. This stops qemu complaining about executing code outside RAM when returning from an exception. */ -memory_region_init_ram (hack,NULL ,"armv7m.hack" ,0x1000 ); +memory_region_init_ram_nofail (hack,NULL ,"armv7m.hack" ,0x1000 );vmstate_register_ram_global (hack);memory_region_add_subregion (address_space_mem,0xfffff000 , hack);hw/arm/cubieboard.c +1
-1@@ -63,7 +63,7 @@ static void cubieboard_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"cubieboard.ram" , +memory_region_init_ram_nofail (&s->sdram,NULL ,"cubieboard.ram" , machine->ram_size);vmstate_register_ram_global (&s->sdram); memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,hw/arm/digic_boards.c +1
-1@@ -51,7 +51,7 @@ typedef struct DigicBoard {static void digic4_board_setup_ram (DigicBoardState *s,hwaddr ram_size) { -memory_region_init_ram (&s->ram,NULL ,"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram,NULL ,"ram" , ram_size);memory_region_add_subregion (get_system_memory (),0 , &s->ram);vmstate_register_ram_global (&s->ram); }hw/arm/exynos4210.c +5
-4@@ -247,7 +247,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->chipid_mem);/* Internal ROM */ -memory_region_init_ram (&s->irom_mem,NULL ,"exynos4210.irom" , +memory_region_init_ram_nofail (&s->irom_mem,NULL ,"exynos4210.irom" ,EXYNOS4210_IROM_SIZE );vmstate_register_ram_global (&s->irom_mem);memory_region_set_readonly (&s->irom_mem, true);@@ -263,7 +263,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->irom_alias_mem);/* Internal RAM */ -memory_region_init_ram (&s->iram_mem,NULL ,"exynos4210.iram" , +memory_region_init_ram_nofail (&s->iram_mem,NULL ,"exynos4210.iram" ,EXYNOS4210_IRAM_SIZE );vmstate_register_ram_global (&s->iram_mem); memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,@@ -272,14 +272,15 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,/* DRAM */ mem_size = ram_size;if (mem_size >EXYNOS4210_DRAM_MAX_SIZE ) { -memory_region_init_ram (&s->dram1_mem,NULL ,"exynos4210.dram1" , +memory_region_init_ram_nofail (&s->dram1_mem,NULL ,"exynos4210.dram1" , mem_size -EXYNOS4210_DRAM_MAX_SIZE );vmstate_register_ram_global (&s->dram1_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM1_BASE_ADDR , &s->dram1_mem); mem_size =EXYNOS4210_DRAM_MAX_SIZE ; } -memory_region_init_ram (&s->dram0_mem,NULL ,"exynos4210.dram0" , mem_size); +memory_region_init_ram_nofail (&s->dram0_mem,NULL ,"exynos4210.dram0" , + mem_size);vmstate_register_ram_global (&s->dram0_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM0_BASE_ADDR , &s->dram0_mem);hw/arm/highbank.c +2
-2@@ -255,12 +255,12 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) sysmem =get_system_memory (); dram =g_new (MemoryRegion,1 ); -memory_region_init_ram (dram,NULL ,"highbank.dram" , ram_size); +memory_region_init_ram_nofail (dram,NULL ,"highbank.dram" , ram_size);/* SDRAM at address zero. */ memory_region_add_subregion (sysmem,0 , dram); sysram =g_new (MemoryRegion,1 ); -memory_region_init_ram (sysram,NULL ,"highbank.sysram" ,0x8000 ); +memory_region_init_ram_nofail (sysram,NULL ,"highbank.sysram" ,0x8000 );memory_region_add_subregion (sysmem,0xfff88000 , sysram);if (bios_name !=NULL ) { sysboot_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);hw/arm/integratorcp.c +3
-2@@ -264,7 +264,8 @@ static int integratorcm_init(SysBusDevice *dev) s->cm_init =0x00000112 ; s->cm_refcnt_offset =muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ),24 ,1000 ); -memory_region_init_ram (&s->flash,OBJECT (s),"integrator.flash" ,0x100000 ); +memory_region_init_ram_nofail (&s->flash,OBJECT (s),"integrator.flash" , +0x100000 );vmstate_register_ram_global (&s->flash); memory_region_init_io(&s->iomem, OBJECT(s), &integratorcm_ops, s,@@ -485,7 +486,7 @@ static void integratorcp_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"integrator.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"integrator.ram" , ram_size);vmstate_register_ram_global (ram);/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ /* ??? RAM should repeat to fill physical memory space. */ hw/arm/kzm.c +2
-2@@ -97,14 +97,14 @@ static void kzm_init(MachineState *machine)/* On a real system, the first 16k is a `secure boot rom' */ -memory_region_init_ram (ram,NULL ,"kzm.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"kzm.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,KZM_RAMADDRESS , ram);memory_region_init_alias (ram_alias,NULL ,"ram.alias" , ram,0 , ram_size);memory_region_add_subregion (address_space_mem,0x88000000 , ram_alias); -memory_region_init_ram (sram,NULL ,"kzm.sram" ,0x4000 ); +memory_region_init_ram_nofail (sram,NULL ,"kzm.sram" ,0x4000 );memory_region_add_subregion (address_space_mem,0x1FFFC000 , sram); dev = sysbus_create_varargs("imx_avic", 0x68000000,hw/arm/mainstone.c +1
-1@@ -123,7 +123,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,/* Setup CPU & memory */ mpu =pxa270_init (address_space_mem, mainstone_binfo.ram_size, cpu_model); -memory_region_init_ram (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/musicpal.c +3
-2@@ -1601,11 +1601,12 @@ static void musicpal_init(MachineState *machine) }/* For now we use a fixed - the original - RAM size */ -memory_region_init_ram (ram,NULL ,"musicpal.ram" ,MP_RAM_DEFAULT_SIZE ); +memory_region_init_ram_nofail (ram,NULL ,"musicpal.ram" , +MP_RAM_DEFAULT_SIZE );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram); -memory_region_init_ram (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE ); +memory_region_init_ram_nofail (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,MP_SRAM_BASE , sram);hw/arm/omap1.c +4
-2@@ -3854,10 +3854,12 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->emiff_ram,NULL ,"omap1.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->emiff_ram,NULL ,"omap1.dram" , + s->sdram_size);vmstate_register_ram_global (&s->emiff_ram);memory_region_add_subregion (system_memory,OMAP_EMIFF_BASE , &s->emiff_ram); -memory_region_init_ram (&s->imif_ram,NULL ,"omap1.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->imif_ram,NULL ,"omap1.sram" , + s->sram_size);vmstate_register_ram_global (&s->imif_ram);memory_region_add_subregion (system_memory,OMAP_IMIF_BASE , &s->imif_ram);hw/arm/omap2.c +2
-2@@ -2266,10 +2266,10 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->sdram,NULL ,"omap2.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"omap2.dram" , s->sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,OMAP2_Q2_BASE , &s->sdram); -memory_region_init_ram (&s->sram,NULL ,"omap2.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->sram,NULL ,"omap2.sram" , s->sram_size);vmstate_register_ram_global (&s->sram);memory_region_add_subregion (sysmem,OMAP2_SRAM_BASE , &s->sram);hw/arm/omap_sx1.c +3
-2@@ -122,7 +122,7 @@ static void sx1_init(MachineState *machine, const int version) machine->cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"omap_sx1.flash0-0" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"omap_sx1.flash0-0" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space,OMAP_CS0_BASE , flash);@@ -164,7 +164,8 @@ static void sx1_init(MachineState *machine, const int version)if ((version ==1 ) && (dinfo =drive_get (IF_PFLASH ,0 , fl_idx)) !=NULL ) { -memory_region_init_ram (flash_1,NULL ,"omap_sx1.flash1-0" , flash1_size); +memory_region_init_ram_nofail (flash_1,NULL ,"omap_sx1.flash1-0" , + flash1_size);vmstate_register_ram_global (flash_1);memory_region_set_readonly (flash_1, true);memory_region_add_subregion (address_space,OMAP_CS1_BASE , flash_1);hw/arm/palm.c +1
-1@@ -212,7 +212,7 @@ static void palmte_init(MachineState *machine) mpu =omap310_mpu_init (address_space_mem, sdram_size, cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"palmte.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"palmte.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,OMAP_CS0_BASE , flash);hw/arm/pxa2xx.c +5
-4@@ -2055,10 +2055,11 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa270.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa270.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa270.internal" ,0x40000 ); +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa270.internal" , +0x40000 );vmstate_register_ram_global (&s->internal);memory_region_add_subregion (address_space,PXA2XX_INTERNAL_BASE , &s->internal);@@ -2186,10 +2187,10 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa255.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa255.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa255.internal" , +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa255.internal" ,PXA2XX_INTERNAL_SIZE );vmstate_register_ram_global (&s->internal); memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE,hw/arm/realview.c +4
-3@@ -137,12 +137,13 @@ static void realview_init(MachineState *machine,/* Core tile RAM. */ low_ram_size = ram_size -0x20000000 ; ram_size =0x20000000 ; -memory_region_init_ram (ram_lo,NULL ,"realview.lowmem" , low_ram_size); +memory_region_init_ram_nofail (ram_lo,NULL ,"realview.lowmem" , + low_ram_size);vmstate_register_ram_global (ram_lo);memory_region_add_subregion (sysmem,0x20000000 , ram_lo); } -memory_region_init_ram (ram_hi,NULL ,"realview.highmem" , ram_size); +memory_region_init_ram_nofail (ram_hi,NULL ,"realview.highmem" , ram_size);vmstate_register_ram_global (ram_hi); low_ram_size = ram_size;if (low_ram_size >0x10000000 )@@ -337,7 +338,7 @@ static void realview_init(MachineState *machine,startup code. I guess this works on real hardware because the BootROM happens to be in ROM/flash or in memory that isn't clobbered until after Linux boots the secondary CPUs. */ -memory_region_init_ram (ram_hack,NULL ,"realview.hack" ,0x1000 ); +memory_region_init_ram_nofail (ram_hack,NULL ,"realview.hack" ,0x1000 );vmstate_register_ram_global (ram_hack);memory_region_add_subregion (sysmem,SMP_BOOT_ADDR , ram_hack);hw/arm/spitz.c +1
-1@@ -912,7 +912,7 @@ static void spitz_common_init(MachineState *machine,sl_flash_register (mpu, (model == spitz) ?FLASH_128M :FLASH_1024M ); -memory_region_init_ram (rom,NULL ,"spitz.rom" ,SPITZ_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"spitz.rom" ,SPITZ_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/strongarm.c +2
-1@@ -1604,7 +1604,8 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"strongarm.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"strongarm.sdram" , + sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,SA_SDCS0 , &s->sdram);hw/arm/tosa.c +1
-1@@ -228,7 +228,7 @@ static void tosa_init(MachineState *machine) mpu =pxa255_init (address_space_mem, tosa_binfo.ram_size); -memory_region_init_ram (rom,NULL ,"tosa.rom" ,TOSA_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"tosa.rom" ,TOSA_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/versatilepb.c +2
-1@@ -198,7 +198,8 @@ static void versatile_init(MachineState *machine, int board_id)fprintf (stderr,"Unable to find CPU definition\n" );exit (1 ); } -memory_region_init_ram (ram,NULL ,"versatile.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"versatile.ram" , + machine->ram_size);vmstate_register_ram_global (ram);/* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */ hw/arm/vexpress.c +5
-5@@ -252,7 +252,7 @@ static void a9_daughterboard_init(const VEDBoardInfo *daughterboard,exit (1 ); } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram); low_ram_size = ram_size;if (low_ram_size >0x4000000 ) {@@ -346,7 +346,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard, } } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram);/* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */ memory_region_add_subregion (sysmem,0x80000000 , ram);@@ -364,7 +364,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard,/* 0x2b060000: SP805 watchdog: not modelled */ /* 0x2b0a0000: PL341 dynamic memory controller: not modelled */ /* 0x2e000000: system SRAM */ -memory_region_init_ram (sram,NULL ,"vexpress.a15sram" ,0x10000 ); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.a15sram" ,0x10000 );vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0x2e000000 , sram);@@ -634,12 +634,12 @@ static void vexpress_common_init(VEDBoardInfo *daughterboard, } sram_size =0x2000000 ; -memory_region_init_ram (sram,NULL ,"vexpress.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem, map[VE_SRAM ], sram); vram_size =0x800000 ; -memory_region_init_ram (vram,NULL ,"vexpress.vram" , vram_size); +memory_region_init_ram_nofail (vram,NULL ,"vexpress.vram" , vram_size);vmstate_register_ram_global (vram);memory_region_add_subregion (sysmem, map[VE_VIDEORAM ], vram);hw/arm/virt.c +2
-1@@ -489,7 +489,8 @@ static void machvirt_init(MachineState *machine)fdt_add_cpu_nodes (vbi);fdt_add_psci_node (vbi); -memory_region_init_ram (ram,NULL ,"mach-virt.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mach-virt.ram" , + machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem, vbi->memmap[VIRT_MEM ].base, ram);hw/arm/xilinx_zynq.c +2
-2@@ -149,12 +149,12 @@ static void zynq_init(MachineState *machine) }/* DDR remapped to address zero. */ -memory_region_init_ram (ext_ram,NULL ,"zynq.ext_ram" , ram_size); +memory_region_init_ram_nofail (ext_ram,NULL ,"zynq.ext_ram" , ram_size);vmstate_register_ram_global (ext_ram);memory_region_add_subregion (address_space_mem,0 , ext_ram);/* 256K of on-chip memory */ -memory_region_init_ram (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 ); +memory_region_init_ram_nofail (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 );vmstate_register_ram_global (ocm_ram);memory_region_add_subregion (address_space_mem,0xFFFC0000 , ocm_ram);hw/block/onenand.c +1
-1@@ -788,7 +788,7 @@ static int onenand_initfn(SysBusDevice *sbd) } s->otp =memset (g_malloc ((64 +2 ) <<PAGE_SHIFT ),0xff , (64 +2 ) <<PAGE_SHIFT ); -memory_region_init_ram (&s->ram,OBJECT (s),"onenand.ram" , +memory_region_init_ram_nofail (&s->ram,OBJECT (s),"onenand.ram" ,0xc000 << s->shift);vmstate_register_ram_global (&s->ram); ram =memory_region_get_ram_ptr (&s->ram);hw/core/loader.c +1
-1@@ -632,7 +632,7 @@ static void *rom_set_mr(Rom *rom, Object *owner, const char *name)void *data; rom->mr =g_malloc (sizeof (*rom->mr)); -memory_region_init_ram (rom->mr, owner, name, rom->datasize); +memory_region_init_ram_nofail (rom->mr, owner, name, rom->datasize);memory_region_set_readonly (rom->mr, true);vmstate_register_ram_global (rom->mr);hw/cris/axis_dev88.c +3
-2@@ -270,13 +270,14 @@ void axisdev88_init(MachineState *machine) env = &cpu->env;/* allocate RAM */ -memory_region_init_ram (phys_ram,NULL ,"axisdev88.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"axisdev88.ram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem,0x40000000 , phys_ram);/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the internal memory. */ -memory_region_init_ram (phys_intmem,NULL ,"axisdev88.chipram" ,INTMEM_SIZE ); +memory_region_init_ram_nofail (phys_intmem,NULL ,"axisdev88.chipram" , +INTMEM_SIZE );vmstate_register_ram_global (phys_intmem);memory_region_add_subregion (address_space_mem,0x38000000 , phys_intmem);hw/display/cg3.c +3
-2@@ -279,7 +279,8 @@ static void cg3_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);CG3State *s =CG3 (obj); -memory_region_init_ram (&s->rom,NULL ,"cg3.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"cg3.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);@@ -306,7 +307,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp) } } -memory_region_init_ram (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size);vmstate_register_ram_global (&s->vram_mem);sysbus_init_mmio (sbd, &s->vram_mem);hw/display/qxl.c +3
-3@@ -1978,14 +1978,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)pci_set_byte (&config[PCI_INTERRUPT_PIN ],1 ); qxl->rom_size =qxl_rom_size (); -memory_region_init_ram (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , +memory_region_init_ram_nofail (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , qxl->rom_size);vmstate_register_ram (&qxl->rom_bar, &qxl->pci.qdev);init_qxl_rom (qxl);init_qxl_ram (qxl); qxl->guest_surfaces.cmds =g_new0 (QXLPHYSICAL , qxl->ssd.num_surfaces); -memory_region_init_ram (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , +memory_region_init_ram_nofail (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , qxl->vram_size);vmstate_register_ram (&qxl->vram_bar, &qxl->pci.qdev); memory_region_init_alias(&qxl->vram32_bar, OBJECT(qxl), "qxl.vram32",@@ -2093,7 +2093,7 @@ static int qxl_init_secondary(PCIDevice *dev) qxl->id = device_id++;qxl_init_ramsize (qxl); -memory_region_init_ram (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , +memory_region_init_ram_nofail (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , qxl->vga.vram_size);vmstate_register_ram (&qxl->vga.vram, &qxl->pci.qdev); qxl->vga.vram_ptr =memory_region_get_ram_ptr (&qxl->vga.vram);hw/display/sm501.c +1
-1@@ -1409,7 +1409,7 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t base, s->dc_crt_control =0x00010000 ;/* allocate local memory */ -memory_region_init_ram (&s->local_mem_region,NULL ,"sm501.local" , +memory_region_init_ram_nofail (&s->local_mem_region,NULL ,"sm501.local" , local_mem_bytes);vmstate_register_ram_global (&s->local_mem_region); s->local_mem =memory_region_get_ram_ptr (&s->local_mem_region);hw/display/tc6393xb.c +1
-1@@ -581,7 +581,7 @@ TC6393xbState *tc6393xb_init(MemoryRegion *sysmem, uint32_t base, qemu_irq irq)memory_region_init_io (&s->iomem,NULL , &tc6393xb_ops, s,"tc6393xb" ,0x10000 );memory_region_add_subregion (sysmem, base, &s->iomem); -memory_region_init_ram (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 ); +memory_region_init_ram_nofail (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 );vmstate_register_ram_global (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);memory_region_add_subregion (sysmem, base +0x100000 , &s->vram);hw/display/tcx.c +3
-2@@ -535,7 +535,8 @@ static void tcx_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);TCXState *s =TCX (obj); -memory_region_init_ram (&s->rom,NULL ,"tcx.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"tcx.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);@@ -566,7 +567,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)uint8_t *vram_base;char *fcode_filename; -memory_region_init_ram (&s->vram_mem,OBJECT (s),"tcx.vram" , +memory_region_init_ram_nofail (&s->vram_mem,OBJECT (s),"tcx.vram" , s->vram_size * (1 +4 +4 ));vmstate_register_ram_global (&s->vram_mem); vram_base =memory_region_get_ram_ptr (&s->vram_mem);hw/display/vga.c +1
-1@@ -2291,7 +2291,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) s->vram_size_mb = s->vram_size >>20 ; s->is_vbe_vmstate =1 ; -memory_region_init_ram (&s->vram, obj,"vga.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram, obj,"vga.vram" , s->vram_size);vmstate_register_ram (&s->vram, global_vmstate ?NULL :DEVICE (obj));xen_register_framebuffer (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);hw/display/vmware_vga.c +2
-1@@ -1201,7 +1201,8 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, s->vga.con =graphic_console_init (dev,0 , &vmsvga_ops, s); s->fifo_size =SVGA_FIFO_SIZE ; -memory_region_init_ram (&s->fifo_ram,NULL ,"vmsvga.fifo" , s->fifo_size); +memory_region_init_ram_nofail (&s->fifo_ram,NULL ,"vmsvga.fifo" , + s->fifo_size);vmstate_register_ram_global (&s->fifo_ram); s->fifo_ptr =memory_region_get_ram_ptr (&s->fifo_ram);hw/i386/kvm/pci-assign.c +1
-1@@ -1943,7 +1943,7 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (dev))); -memory_region_init_ram (&dev->dev.rom,OBJECT (dev), name, st.st_size); +memory_region_init_ram_nofail (&dev->dev.rom,OBJECT (dev), name, st.st_size);vmstate_register_ram (&dev->dev.rom, &dev->dev.qdev); ptr =memory_region_get_ram_ptr (&dev->dev.rom);memset (ptr,0xff , st.st_size);hw/i386/pc.c +1
-1@@ -1272,7 +1272,7 @@ FWCfgState *pc_memory_init(MachineState *machine,pc_system_firmware_init (rom_memory, guest_info->isapc_ram_fw); option_rom_mr =g_malloc (sizeof (*option_rom_mr)); -memory_region_init_ram (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE ); +memory_region_init_ram_nofail (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE );vmstate_register_ram_global (option_rom_mr); memory_region_add_subregion_overlap(rom_memory, PC_ROM_MIN_VGA,hw/i386/pc_sysfw.c +2
-2@@ -55,7 +55,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory,/* map the last 128KB of the BIOS in ISA space */ isa_bios_size =MIN (flash_size,128 *1024 ); isa_bios =g_malloc (sizeof (*isa_bios)); -memory_region_init_ram (isa_bios,NULL ,"isa-bios" , isa_bios_size); +memory_region_init_ram_nofail (isa_bios,NULL ,"isa-bios" , isa_bios_size);vmstate_register_ram_global (isa_bios); memory_region_add_subregion_overlap(rom_memory, 0x100000 - isa_bios_size,@@ -192,7 +192,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) goto bios_error; } bios =g_malloc (sizeof (*bios)); -memory_region_init_ram (bios,NULL ,"pc.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"pc.bios" , bios_size);vmstate_register_ram_global (bios);if (!isapc_ram_fw) {memory_region_set_readonly (bios, true);hw/input/milkymist-softusb.c +2
-2@@ -249,12 +249,12 @@ static int milkymist_softusb_init(SysBusDevice *dev)sysbus_init_mmio (dev, &s->regs_region);/* register pmem and dmem */ -memory_region_init_ram (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , +memory_region_init_ram_nofail (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , s->pmem_size);vmstate_register_ram_global (&s->pmem); s->pmem_ptr =memory_region_get_ram_ptr (&s->pmem);sysbus_init_mmio (dev, &s->pmem); -memory_region_init_ram (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , +memory_region_init_ram_nofail (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , s->dmem_size);vmstate_register_ram_global (&s->dmem); s->dmem_ptr =memory_region_get_ram_ptr (&s->dmem);hw/lm32/lm32_boards.c +3
-2@@ -111,7 +111,7 @@ static void lm32_evr_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_evr.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_evr.sdram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);@@ -213,7 +213,8 @@ static void lm32_uclinux_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_uclinux.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_uclinux.sdram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);hw/lm32/milkymist.c +2
-1@@ -118,7 +118,8 @@ milkymist_init(MachineState *machine)cpu_lm32_set_phys_msb_ignore (env,1 ); -memory_region_init_ram (phys_sdram,NULL ,"milkymist.sdram" , sdram_size); +memory_region_init_ram_nofail (phys_sdram,NULL ,"milkymist.sdram" , + sdram_size);vmstate_register_ram_global (phys_sdram);memory_region_add_subregion (address_space_mem, sdram_base, phys_sdram);hw/m68k/an5206.c +2
-2@@ -50,12 +50,12 @@ static void an5206_init(MachineState *machine) env->rambar0 =AN5206_RAMBAR_ADDR |1 ;/* DRAM at address zero */ -memory_region_init_ram (ram,NULL ,"an5206.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"an5206.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"an5206.sram" ,512 ); +memory_region_init_ram_nofail (sram,NULL ,"an5206.sram" ,512 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,AN5206_RAMBAR_ADDR , sram);hw/m68k/dummy_m68k.c +1
-1@@ -40,7 +40,7 @@ static void dummy_m68k_init(MachineState *machine) env->vbr =0 ;/* RAM at address zero */ -memory_region_init_ram (ram,NULL ,"dummy_m68k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"dummy_m68k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);hw/m68k/mcf5208.c +2
-2@@ -218,12 +218,12 @@ static void mcf5208evb_init(MachineState *machine)/* TODO: Configure BARs. */ /* DRAM at 0x40000000 */ -memory_region_init_ram (ram,NULL ,"mcf5208.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mcf5208.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"mcf5208.sram" ,16384 ); +memory_region_init_ram_nofail (sram,NULL ,"mcf5208.sram" ,16384 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x80000000 , sram);hw/microblaze/petalogix_ml605_mmu.c +4
-3@@ -99,12 +99,13 @@ petalogix_ml605_init(MachineState *machine)object_property_set_bool (OBJECT (cpu), true,"realized" , &error_abort);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL ,"petalogix_ml605.lmb_bram" , -LMB_BRAM_SIZE ); +memory_region_init_ram_nofail (phys_lmb_bram,NULL , +"petalogix_ml605.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (address_space_mem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_ml605.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_ml605.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ddr_base, phys_ram);hw/microblaze/petalogix_s3adsp1800_mmu.c +3
-2@@ -80,12 +80,13 @@ petalogix_s3adsp1800_init(MachineState *machine) cpu =cpu_mb_init (cpu_model);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL , +memory_region_init_ram_nofail (phys_lmb_bram,NULL ,"petalogix_s3adsp1800.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (sysmem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (sysmem, ddr_base, phys_ram);hw/mips/mips_fulong2e.c +2
-2@@ -302,9 +302,9 @@ static void mips_fulong2e_init(MachineState *machine) bios_size =1024 *1024 ;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"fulong2e.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"fulong2e.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"fulong2e.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"fulong2e.bios" , bios_size);vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);hw/mips/mips_jazz.c +4
-3@@ -179,11 +179,12 @@ static void mips_jazz_init(MemoryRegion *address_space, cc->do_unassigned_access = mips_jazz_do_unassigned_access;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"mips_jazz.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_jazz.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space,0 , ram); -memory_region_init_ram (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_jazz.bios" , +MAGNUM_BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true); memory_region_init_alias(bios2, NULL, "mips_jazz.bios", bios,@@ -244,7 +245,7 @@ static void mips_jazz_init(MemoryRegion *address_space, {/* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr =g_new (MemoryRegion,1 ); -memory_region_init_ram (rom_mr,NULL ,"g364fb.rom" ,0x80000 ); +memory_region_init_ram_nofail (rom_mr,NULL ,"g364fb.rom" ,0x80000 );vmstate_register_ram_global (rom_mr);memory_region_set_readonly (rom_mr, true);uint8_t *rom =memory_region_get_ram_ptr (rom_mr);hw/mips/mips_malta.c +2
-2@@ -992,7 +992,7 @@ void mips_malta_init(MachineState *machine) }/* register RAM at high address where it is undisturbed by IO */ -memory_region_init_ram (ram_high,NULL ,"mips_malta.ram" , ram_size); +memory_region_init_ram_nofail (ram_high,NULL ,"mips_malta.ram" , ram_size);vmstate_register_ram_global (ram_high);memory_region_add_subregion (system_memory,0x80000000 , ram_high);@@ -1116,7 +1116,7 @@ void mips_malta_init(MachineState *machine)* handled by an overlapping region as the resulting ROM code subpage * regions are not executable. */ -memory_region_init_ram (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE );if (!rom_copy (memory_region_get_ram_ptr (bios_copy),FLASH_ADDRESS ,BIOS_SIZE )) { memcpy(memory_region_get_ram_ptr(bios_copy),hw/mips/mips_mipssim.c +2
-2@@ -171,9 +171,9 @@ mips_mipssim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"mips_mipssim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_mipssim.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);hw/mips/mips_r4k.c +2
-2@@ -204,7 +204,7 @@ void mips_r4k_init(MachineState *machine) ((unsigned int)ram_size / (1 << 20)));exit (1 ); } -memory_region_init_ram (ram,NULL ,"mips_r4k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_r4k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);@@ -231,7 +231,7 @@ void mips_r4k_init(MachineState *machine)#endif if ((bios_size >0 ) && (bios_size <=BIOS_SIZE )) { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),0x1fc00000 , bios);hw/moxie/moxiesim.c +2
-2@@ -123,11 +123,11 @@ static void moxiesim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, cpu);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"moxiesim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"moxiesim.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem, ram_base, ram); -memory_region_init_ram (rom,NULL ,"moxie.rom" ,128 *0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"moxie.rom" ,128 *0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0x1000 , rom);hw/net/milkymist-minimac2.c +2
-2@@ -471,8 +471,8 @@ static int milkymist_minimac2_init(SysBusDevice *sbd)sysbus_init_mmio (sbd, &s->regs_region);/* register buffers memory */ -memory_region_init_ram (&s->buffers,OBJECT (dev),"milkymist-minimac2.buffers" , - buffers_size); +memory_region_init_ram_nofail (&s->buffers,OBJECT (dev), +"milkymist-minimac2.buffers" , buffers_size);vmstate_register_ram_global (&s->buffers); s->rx0_buf =memory_region_get_ram_ptr (&s->buffers); s->rx1_buf = s->rx0_buf +MINIMAC2_BUFFER_SIZE ;hw/openrisc/openrisc_sim.c +1
-1@@ -114,7 +114,7 @@ static void openrisc_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"openrisc.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"openrisc.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram);hw/pci-host/prep.c +1
-1@@ -299,7 +299,7 @@ static int raven_init(PCIDevice *d) d->config[0x0D ] =0x10 ;// latency_timer d->config[0x34 ] =0x00 ;// capabilities_pointer -memory_region_init_ram (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE );memory_region_set_readonly (&s->bios, true);memory_region_add_subregion (get_system_memory (), (uint32_t )(-BIOS_SIZE ), &s->bios);hw/pci/pci.c +1
-1@@ -1974,7 +1974,7 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (pdev))); } pdev->has_rom = true; -memory_region_init_ram (&pdev->rom,OBJECT (pdev), name, size); +memory_region_init_ram_nofail (&pdev->rom,OBJECT (pdev), name, size);vmstate_register_ram (&pdev->rom, &pdev->qdev); ptr =memory_region_get_ram_ptr (&pdev->rom);load_image (path, ptr);hw/ppc/mac_newworld.c +1
-1@@ -204,7 +204,7 @@ static void ppc_core99_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )hw/ppc/mac_oldworld.c +1
-1@@ -135,7 +135,7 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )hw/ppc/ppc405_boards.c +4
-3@@ -214,7 +214,7 @@ static void ref405ep_init(MachineState *machine) 33333333, &pic, kernel_filename == NULL ? 0 : 1);/* allocate SRAM */ sram_size =512 *1024 ; -memory_region_init_ram (sram,NULL ,"ef405ep.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"ef405ep.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0xFFF00000 , sram);/* allocate and load BIOS */ @@ -246,7 +246,7 @@ static void ref405ep_init(MachineState *machine)printf ("Load BIOS from file\n" );#endif bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )@@ -572,7 +572,8 @@ static void taihu_405ep_init(MachineState *machine)if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"taihu_405ep.bios" , +BIOS_SIZE );vmstate_register_ram_global (bios); filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);if (filename) {hw/ppc/ppc405_uc.c +1
-1@@ -974,7 +974,7 @@ static void ppc405_ocm_init(CPUPPCState *env) ocm =g_malloc0 (sizeof (ppc405_ocm_t));/* XXX: Size is 4096 or 0x04000000 */ -memory_region_init_ram (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 ); +memory_region_init_ram_nofail (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 );vmstate_register_ram_global (&ocm->isarc_ram);memory_region_init_alias (&ocm->dsarc_ram,NULL ,"ppc405.dsarc" , &ocm->isarc_ram,0 ,4096 );hw/s390x/s390-virtio-ccw.c +1
-1@@ -110,7 +110,7 @@ static void ccw_init(MachineState *machine)virtio_ccw_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);hw/s390x/s390-virtio.c +1
-1@@ -256,7 +256,7 @@ static void s390_init(MachineState *machine)s390_virtio_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);hw/sh4/r2d.c +1
-1@@ -255,7 +255,7 @@ static void r2d_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate memory space */ -memory_region_init_ram (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE ); +memory_region_init_ram_nofail (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE );vmstate_register_ram_global (sdram);memory_region_add_subregion (address_space_mem,SDRAM_BASE , sdram);/* Register peripherals */ hw/sh4/shix.c +3
-3@@ -59,14 +59,14 @@ static void shix_init(MachineState *machine) }/* Allocate memory space */ -memory_region_init_ram (rom,NULL ,"shix.rom" ,0x4000 ); +memory_region_init_ram_nofail (rom,NULL ,"shix.rom" ,0x4000 );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (sysmem,0x00000000 , rom); -memory_region_init_ram (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 );vmstate_register_ram_global (&sdram[0 ]);memory_region_add_subregion (sysmem,0x08000000 , &sdram[0 ]); -memory_region_init_ram (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 );vmstate_register_ram_global (&sdram[1 ]);memory_region_add_subregion (sysmem,0x0c000000 , &sdram[1 ]);hw/sparc/leon3.c +2
-2@@ -151,13 +151,13 @@ static void leon3_generic_hw_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"leon3.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"leon3.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Allocate BIOS */ prom_size =8 *1024 *1024 ;/* 8Mb */ -memory_region_init_ram (prom,NULL ,"Leon3.bios" , prom_size); +memory_region_init_ram_nofail (prom,NULL ,"Leon3.bios" , prom_size);vmstate_register_ram_global (prom);memory_region_set_readonly (prom, true);memory_region_add_subregion (address_space_mem,0x00000000 , prom);hw/sparc/sun4m.c +5
-4@@ -620,7 +620,7 @@ static int idreg_init1(SysBusDevice *dev) {IDRegState *s =MACIO_ID_REGISTER (dev); -memory_region_init_ram (&s->mem,OBJECT (s), +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.idreg" ,sizeof (idreg_data));vmstate_register_ram_global (&s->mem);memory_region_set_readonly (&s->mem, true);@@ -668,7 +668,7 @@ static int afx_init1(SysBusDevice *dev) {AFXState *s =TCX_AFX (dev); -memory_region_init_ram (&s->mem,OBJECT (s),"sun4m.afx" ,4 ); +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.afx" ,4 );vmstate_register_ram_global (&s->mem);sysbus_init_mmio (dev, &s->mem);return 0 ;@@ -742,7 +742,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4m.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4m.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);@@ -784,7 +785,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4M_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4m.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4m.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;hw/sparc64/sun4u.c +3
-2@@ -686,7 +686,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4u.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4u.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);@@ -729,7 +730,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4U_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4u.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4u.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;hw/unicore32/puv3.c +1
-1@@ -74,7 +74,7 @@ static void puv3_board_init(CPUUniCore32State *env, ram_addr_t ram_size)MemoryRegion *ram_memory =g_new (MemoryRegion,1 );/* SDRAM at address zero. */ -memory_region_init_ram (ram_memory,NULL ,"puv3.ram" , ram_size); +memory_region_init_ram_nofail (ram_memory,NULL ,"puv3.ram" , ram_size);vmstate_register_ram_global (ram_memory);memory_region_add_subregion (get_system_memory (),0 , ram_memory); }hw/xtensa/sim.c +2
-2@@ -79,12 +79,12 @@ static void xtensa_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"xtensa.sram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"xtensa.sram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"xtensa.rom" ,0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"xtensa.rom" ,0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0xfe000000 , rom);hw/xtensa/xtfpga.c +3
-3@@ -143,7 +143,7 @@ static void lx60_net_init(MemoryRegion *address_space, sysbus_mmio_get_region(s, 1)); ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,OBJECT (s),"open_eth.ram" ,16384 ); +memory_region_init_ram_nofail (ram,OBJECT (s),"open_eth.ram" ,16384 );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space, buffers, ram); }@@ -205,7 +205,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"lx60.dram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"lx60.dram" , machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (system_memory,0 , ram);@@ -254,7 +254,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)uint32_t cur_lowmem =QEMU_ALIGN_UP (lowmem_end /2 ,4096 ); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"lx60.sram" , board->sram_size); +memory_region_init_ram_nofail (rom,NULL ,"lx60.sram" , board->sram_size);vmstate_register_ram_global (rom);memory_region_add_subregion (system_memory,0xfe000000 , rom);include/exec/memory.h +6
-6@@ -321,18 +321,18 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, Error **errp);/** -* memory_region_init_ram: Initialize RAM memory region. Accesses into the -* region will modify memory directly. +* memory_region_init_ram_nofail: Initialize RAM memory region. Accesses into +* the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. */ -void memory_region_init_ram (MemoryRegion *mr, -struct Object *owner, -const char *name, -uint64_t size); +void memory_region_init_ram_nofail (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size);#ifdef __linux__/** memory.c +4
-4@@ -1174,10 +1174,10 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, mr->ram_addr =qemu_ram_alloc (size, mr, errp); } -void memory_region_init_ram (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size) +void memory_region_init_ram_nofail (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size) {Error *local_err =NULL ;numa.c +2
-2@@ -263,14 +263,14 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,if (err) {qerror_report_err (err);error_free (err); -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }#else fprintf (stderr,"-mem-path not supported on this host\n" );exit (1 );#endif }else { -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }vmstate_register_ram_global (mr); }xen-hvm.c +1
-2@@ -188,7 +188,7 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size,*/ block_len = (1ULL <<32 ) + *above_4g_mem_size; } -memory_region_init_ram (&ram_memory,NULL ,"xen.ram" , block_len); +memory_region_init_ram_nofail (&ram_memory,NULL ,"xen.ram" , block_len); *ram_memory_p = &ram_memory;vmstate_register_ram_global (&ram_memory); --1.9.3
Re: [Qemu-devel] [PATCH v4 3/6] rename memory_region_init_ram to memory_region_init_ram_nofail
Quoted 90 lines · Hu Tao
Quoted 76 lines · Peter Crosthwaite
Quoted 66 lines · Hu Tao
Signed-off-by Hu Tao <[email protected]>--- hw/alpha/typhoon.c | 2 +- hw/arm/armv7m.c | 6 +++--- hw/arm/cubieboard.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4210.c | 9 +++++---- hw/arm/highbank.c | 4 ++-- hw/arm/integratorcp.c | 5 +++-- hw/arm/kzm.c | 4 ++-- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 5 +++-- hw/arm/omap1.c | 6 ++++-- hw/arm/omap2.c | 4 ++-- hw/arm/omap_sx1.c | 5 +++-- hw/arm/palm.c | 2 +- hw/arm/pxa2xx.c | 9 +++++---- hw/arm/realview.c | 7 ++++--- hw/arm/spitz.c | 2 +- hw/arm/strongarm.c | 3 ++- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 3 ++- hw/arm/vexpress.c | 10 +++++----- hw/arm/virt.c | 3 ++- hw/arm/xilinx_zynq.c | 4 ++-- hw/block/onenand.c | 2 +- hw/core/loader.c | 2 +- hw/cris/axis_dev88.c | 5 +++-- hw/display/cg3.c | 5 +++-- hw/display/qxl.c | 6 +++--- hw/display/sm501.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 5 +++-- hw/display/vga.c | 2 +- hw/display/vmware_vga.c | 3 ++- hw/i386/kvm/pci-assign.c | 2 +- hw/i386/pc.c | 2 +- hw/i386/pc_sysfw.c | 4 ++-- hw/input/milkymist-softusb.c | 4 ++-- hw/lm32/lm32_boards.c | 5 +++-- hw/lm32/milkymist.c | 3 ++- hw/m68k/an5206.c | 4 ++-- hw/m68k/dummy_m68k.c | 2 +- hw/m68k/mcf5208.c | 4 ++-- hw/microblaze/petalogix_ml605_mmu.c | 7 ++++--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 5 +++-- hw/mips/mips_fulong2e.c | 4 ++-- hw/mips/mips_jazz.c | 7 ++++--- hw/mips/mips_malta.c | 4 ++-- hw/mips/mips_mipssim.c | 4 ++-- hw/mips/mips_r4k.c | 4 ++-- hw/moxie/moxiesim.c | 4 ++-- hw/net/milkymist-minimac2.c | 4 ++-- hw/openrisc/openrisc_sim.c | 2 +- hw/pci-host/prep.c | 2 +- hw/pci/pci.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 7 ++++--- hw/ppc/ppc405_uc.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/shix.c | 6 +++--- hw/sparc/leon3.c | 4 ++-- hw/sparc/sun4m.c | 9 +++++----Quoted 8 lines
hw/sparc64/sun4u.c | 5 +++-- hw/unicore32/puv3.c | 2 +- hw/xtensa/sim.c | 4 ++-- hw/xtensa/xtfpga.c | 6 +++--- include/exec/memory.h | 12 ++++++------ memory.c | 8 ++++---- numa.c | 4 ++-- xen-hvm.c | 2 +-Quoted 3 lines
If you are commiting to a tree-wide fixup, I think its best to get the just Error ** version in use tree wide and just drop
may_failandno_failvariants.Agreed.
Quoted 3 lines
The only reason to add a second fn would be to avoid having to touch all the call sites which you have now done.
Yes.
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
Ultimately there should be one API used by all
no_failandmay_failcall sites that accepts an Error **. "no fail" callsites pass in&error_abort. I think this is what you were suggesting in P1?I didn't think
error_abort. So it's simpler to first add Error ** to API, update call sites to pass in&error_abort. This way we don't introducemay_failorno_failat all.
Yes I think so.
Regards,
Peter
Quoted 1,389 lines
Quoted 1,388 lines
I don't see this change as being much more minimal and it's at the expense of correctness.
Regards,
PeterQuoted 1,381 lines
72 files changed, 159 insertions(+), 136 deletions(-)hw/alpha/typhoon.c +1
-1@@ -843,7 +843,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,/* Main memory region, 0x00.0000.0000. Real hardware supports 32GB, but the address space hole reserved at this point is 8TB. */ -memory_region_init_ram (&s->ram_region,OBJECT (s),"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram_region,OBJECT (s),"ram" , ram_size);vmstate_register_ram_global (&s->ram_region);memory_region_add_subregion (addr_space,0 , &s->ram_region);hw/arm/armv7m.c +3
-3@@ -210,11 +210,11 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,#endif /* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"armv7m.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,0 , flash); -memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"armv7m.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x20000000 , sram);armv7m_bitband_init ();@@ -255,7 +255,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,/* Hack to map an additional page of ram at the top of the address space. This stops qemu complaining about executing code outside RAM when returning from an exception. */ -memory_region_init_ram (hack,NULL ,"armv7m.hack" ,0x1000 ); +memory_region_init_ram_nofail (hack,NULL ,"armv7m.hack" ,0x1000 );vmstate_register_ram_global (hack);memory_region_add_subregion (address_space_mem,0xfffff000 , hack);hw/arm/cubieboard.c +1
-1@@ -63,7 +63,7 @@ static void cubieboard_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"cubieboard.ram" , +memory_region_init_ram_nofail (&s->sdram,NULL ,"cubieboard.ram" , machine->ram_size);vmstate_register_ram_global (&s->sdram); memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,hw/arm/digic_boards.c +1
-1@@ -51,7 +51,7 @@ typedef struct DigicBoard {static void digic4_board_setup_ram (DigicBoardState *s,hwaddr ram_size) { -memory_region_init_ram (&s->ram,NULL ,"ram" , ram_size); +memory_region_init_ram_nofail (&s->ram,NULL ,"ram" , ram_size);memory_region_add_subregion (get_system_memory (),0 , &s->ram);vmstate_register_ram_global (&s->ram); }hw/arm/exynos4210.c +5
-4@@ -247,7 +247,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->chipid_mem);/* Internal ROM */ -memory_region_init_ram (&s->irom_mem,NULL ,"exynos4210.irom" , +memory_region_init_ram_nofail (&s->irom_mem,NULL ,"exynos4210.irom" ,EXYNOS4210_IROM_SIZE );vmstate_register_ram_global (&s->irom_mem);memory_region_set_readonly (&s->irom_mem, true);@@ -263,7 +263,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, &s->irom_alias_mem);/* Internal RAM */ -memory_region_init_ram (&s->iram_mem,NULL ,"exynos4210.iram" , +memory_region_init_ram_nofail (&s->iram_mem,NULL ,"exynos4210.iram" ,EXYNOS4210_IRAM_SIZE );vmstate_register_ram_global (&s->iram_mem); memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,@@ -272,14 +272,15 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,/* DRAM */ mem_size = ram_size;if (mem_size >EXYNOS4210_DRAM_MAX_SIZE ) { -memory_region_init_ram (&s->dram1_mem,NULL ,"exynos4210.dram1" , +memory_region_init_ram_nofail (&s->dram1_mem,NULL ,"exynos4210.dram1" , mem_size -EXYNOS4210_DRAM_MAX_SIZE );vmstate_register_ram_global (&s->dram1_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM1_BASE_ADDR , &s->dram1_mem); mem_size =EXYNOS4210_DRAM_MAX_SIZE ; } -memory_region_init_ram (&s->dram0_mem,NULL ,"exynos4210.dram0" , mem_size); +memory_region_init_ram_nofail (&s->dram0_mem,NULL ,"exynos4210.dram0" , + mem_size);vmstate_register_ram_global (&s->dram0_mem);memory_region_add_subregion (system_mem,EXYNOS4210_DRAM0_BASE_ADDR , &s->dram0_mem);hw/arm/highbank.c +2
-2@@ -255,12 +255,12 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) sysmem =get_system_memory (); dram =g_new (MemoryRegion,1 ); -memory_region_init_ram (dram,NULL ,"highbank.dram" , ram_size); +memory_region_init_ram_nofail (dram,NULL ,"highbank.dram" , ram_size);/* SDRAM at address zero. */ memory_region_add_subregion (sysmem,0 , dram); sysram =g_new (MemoryRegion,1 ); -memory_region_init_ram (sysram,NULL ,"highbank.sysram" ,0x8000 ); +memory_region_init_ram_nofail (sysram,NULL ,"highbank.sysram" ,0x8000 );memory_region_add_subregion (sysmem,0xfff88000 , sysram);if (bios_name !=NULL ) { sysboot_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);hw/arm/integratorcp.c +3
-2@@ -264,7 +264,8 @@ static int integratorcm_init(SysBusDevice *dev) s->cm_init =0x00000112 ; s->cm_refcnt_offset =muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ),24 ,1000 ); -memory_region_init_ram (&s->flash,OBJECT (s),"integrator.flash" ,0x100000 ); +memory_region_init_ram_nofail (&s->flash,OBJECT (s),"integrator.flash" , +0x100000 );vmstate_register_ram_global (&s->flash); memory_region_init_io(&s->iomem, OBJECT(s), &integratorcm_ops, s,@@ -485,7 +486,7 @@ static void integratorcp_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"integrator.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"integrator.ram" , ram_size);vmstate_register_ram_global (ram);/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ /* ??? RAM should repeat to fill physical memory space. */ hw/arm/kzm.c +2
-2@@ -97,14 +97,14 @@ static void kzm_init(MachineState *machine)/* On a real system, the first 16k is a `secure boot rom' */ -memory_region_init_ram (ram,NULL ,"kzm.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"kzm.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,KZM_RAMADDRESS , ram);memory_region_init_alias (ram_alias,NULL ,"ram.alias" , ram,0 , ram_size);memory_region_add_subregion (address_space_mem,0x88000000 , ram_alias); -memory_region_init_ram (sram,NULL ,"kzm.sram" ,0x4000 ); +memory_region_init_ram_nofail (sram,NULL ,"kzm.sram" ,0x4000 );memory_region_add_subregion (address_space_mem,0x1FFFC000 , sram); dev = sysbus_create_varargs("imx_avic", 0x68000000,hw/arm/mainstone.c +1
-1@@ -123,7 +123,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,/* Setup CPU & memory */ mpu =pxa270_init (address_space_mem, mainstone_binfo.ram_size, cpu_model); -memory_region_init_ram (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"mainstone.rom" ,MAINSTONE_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/musicpal.c +3
-2@@ -1601,11 +1601,12 @@ static void musicpal_init(MachineState *machine) }/* For now we use a fixed - the original - RAM size */ -memory_region_init_ram (ram,NULL ,"musicpal.ram" ,MP_RAM_DEFAULT_SIZE ); +memory_region_init_ram_nofail (ram,NULL ,"musicpal.ram" , +MP_RAM_DEFAULT_SIZE );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram); -memory_region_init_ram (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE ); +memory_region_init_ram_nofail (sram,NULL ,"musicpal.sram" ,MP_SRAM_SIZE );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,MP_SRAM_BASE , sram);hw/arm/omap1.c +4
-2@@ -3854,10 +3854,12 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->emiff_ram,NULL ,"omap1.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->emiff_ram,NULL ,"omap1.dram" , + s->sdram_size);vmstate_register_ram_global (&s->emiff_ram);memory_region_add_subregion (system_memory,OMAP_EMIFF_BASE , &s->emiff_ram); -memory_region_init_ram (&s->imif_ram,NULL ,"omap1.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->imif_ram,NULL ,"omap1.sram" , + s->sram_size);vmstate_register_ram_global (&s->imif_ram);memory_region_add_subregion (system_memory,OMAP_IMIF_BASE , &s->imif_ram);hw/arm/omap2.c +2
-2@@ -2266,10 +2266,10 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,omap_clk_init (s);/* Memory-mapped stuff */ -memory_region_init_ram (&s->sdram,NULL ,"omap2.dram" , s->sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"omap2.dram" , s->sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,OMAP2_Q2_BASE , &s->sdram); -memory_region_init_ram (&s->sram,NULL ,"omap2.sram" , s->sram_size); +memory_region_init_ram_nofail (&s->sram,NULL ,"omap2.sram" , s->sram_size);vmstate_register_ram_global (&s->sram);memory_region_add_subregion (sysmem,OMAP2_SRAM_BASE , &s->sram);hw/arm/omap_sx1.c +3
-2@@ -122,7 +122,7 @@ static void sx1_init(MachineState *machine, const int version) machine->cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"omap_sx1.flash0-0" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"omap_sx1.flash0-0" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space,OMAP_CS0_BASE , flash);@@ -164,7 +164,8 @@ static void sx1_init(MachineState *machine, const int version)if ((version ==1 ) && (dinfo =drive_get (IF_PFLASH ,0 , fl_idx)) !=NULL ) { -memory_region_init_ram (flash_1,NULL ,"omap_sx1.flash1-0" , flash1_size); +memory_region_init_ram_nofail (flash_1,NULL ,"omap_sx1.flash1-0" , + flash1_size);vmstate_register_ram_global (flash_1);memory_region_set_readonly (flash_1, true);memory_region_add_subregion (address_space,OMAP_CS1_BASE , flash_1);hw/arm/palm.c +1
-1@@ -212,7 +212,7 @@ static void palmte_init(MachineState *machine) mpu =omap310_mpu_init (address_space_mem, sdram_size, cpu_model);/* External Flash (EMIFS) */ -memory_region_init_ram (flash,NULL ,"palmte.flash" , flash_size); +memory_region_init_ram_nofail (flash,NULL ,"palmte.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true);memory_region_add_subregion (address_space_mem,OMAP_CS0_BASE , flash);hw/arm/pxa2xx.c +5
-4@@ -2055,10 +2055,11 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa270.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa270.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa270.internal" ,0x40000 ); +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa270.internal" , +0x40000 );vmstate_register_ram_global (&s->internal);memory_region_add_subregion (address_space,PXA2XX_INTERNAL_BASE , &s->internal);@@ -2186,10 +2187,10 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) s->reset =qemu_allocate_irq (pxa2xx_reset, s,0 );/* SDRAM & Internal Memory Storage */ -memory_region_init_ram (&s->sdram,NULL ,"pxa255.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"pxa255.sdram" , sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (address_space,PXA2XX_SDRAM_BASE , &s->sdram); -memory_region_init_ram (&s->internal,NULL ,"pxa255.internal" , +memory_region_init_ram_nofail (&s->internal,NULL ,"pxa255.internal" ,PXA2XX_INTERNAL_SIZE );vmstate_register_ram_global (&s->internal); memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE,hw/arm/realview.c +4
-3@@ -137,12 +137,13 @@ static void realview_init(MachineState *machine,/* Core tile RAM. */ low_ram_size = ram_size -0x20000000 ; ram_size =0x20000000 ; -memory_region_init_ram (ram_lo,NULL ,"realview.lowmem" , low_ram_size); +memory_region_init_ram_nofail (ram_lo,NULL ,"realview.lowmem" , + low_ram_size);vmstate_register_ram_global (ram_lo);memory_region_add_subregion (sysmem,0x20000000 , ram_lo); } -memory_region_init_ram (ram_hi,NULL ,"realview.highmem" , ram_size); +memory_region_init_ram_nofail (ram_hi,NULL ,"realview.highmem" , ram_size);vmstate_register_ram_global (ram_hi); low_ram_size = ram_size;if (low_ram_size >0x10000000 )@@ -337,7 +338,7 @@ static void realview_init(MachineState *machine,startup code. I guess this works on real hardware because the BootROM happens to be in ROM/flash or in memory that isn't clobbered until after Linux boots the secondary CPUs. */ -memory_region_init_ram (ram_hack,NULL ,"realview.hack" ,0x1000 ); +memory_region_init_ram_nofail (ram_hack,NULL ,"realview.hack" ,0x1000 );vmstate_register_ram_global (ram_hack);memory_region_add_subregion (sysmem,SMP_BOOT_ADDR , ram_hack);hw/arm/spitz.c +1
-1@@ -912,7 +912,7 @@ static void spitz_common_init(MachineState *machine,sl_flash_register (mpu, (model == spitz) ?FLASH_128M :FLASH_1024M ); -memory_region_init_ram (rom,NULL ,"spitz.rom" ,SPITZ_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"spitz.rom" ,SPITZ_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/strongarm.c +2
-1@@ -1604,7 +1604,8 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,exit (1 ); } -memory_region_init_ram (&s->sdram,NULL ,"strongarm.sdram" , sdram_size); +memory_region_init_ram_nofail (&s->sdram,NULL ,"strongarm.sdram" , + sdram_size);vmstate_register_ram_global (&s->sdram);memory_region_add_subregion (sysmem,SA_SDCS0 , &s->sdram);hw/arm/tosa.c +1
-1@@ -228,7 +228,7 @@ static void tosa_init(MachineState *machine) mpu =pxa255_init (address_space_mem, tosa_binfo.ram_size); -memory_region_init_ram (rom,NULL ,"tosa.rom" ,TOSA_ROM ); +memory_region_init_ram_nofail (rom,NULL ,"tosa.rom" ,TOSA_ROM );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (address_space_mem,0 , rom);hw/arm/versatilepb.c +2
-1@@ -198,7 +198,8 @@ static void versatile_init(MachineState *machine, int board_id)fprintf (stderr,"Unable to find CPU definition\n" );exit (1 ); } -memory_region_init_ram (ram,NULL ,"versatile.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"versatile.ram" , + machine->ram_size);vmstate_register_ram_global (ram);/* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */ hw/arm/vexpress.c +5
-5@@ -252,7 +252,7 @@ static void a9_daughterboard_init(const VEDBoardInfo *daughterboard,exit (1 ); } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram); low_ram_size = ram_size;if (low_ram_size >0x4000000 ) {@@ -346,7 +346,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard, } } -memory_region_init_ram (ram,NULL ,"vexpress.highmem" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"vexpress.highmem" , ram_size);vmstate_register_ram_global (ram);/* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */ memory_region_add_subregion (sysmem,0x80000000 , ram);@@ -364,7 +364,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard,/* 0x2b060000: SP805 watchdog: not modelled */ /* 0x2b0a0000: PL341 dynamic memory controller: not modelled */ /* 0x2e000000: system SRAM */ -memory_region_init_ram (sram,NULL ,"vexpress.a15sram" ,0x10000 ); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.a15sram" ,0x10000 );vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0x2e000000 , sram);@@ -634,12 +634,12 @@ static void vexpress_common_init(VEDBoardInfo *daughterboard, } sram_size =0x2000000 ; -memory_region_init_ram (sram,NULL ,"vexpress.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"vexpress.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem, map[VE_SRAM ], sram); vram_size =0x800000 ; -memory_region_init_ram (vram,NULL ,"vexpress.vram" , vram_size); +memory_region_init_ram_nofail (vram,NULL ,"vexpress.vram" , vram_size);vmstate_register_ram_global (vram);memory_region_add_subregion (sysmem, map[VE_VIDEORAM ], vram);hw/arm/virt.c +2
-1@@ -489,7 +489,8 @@ static void machvirt_init(MachineState *machine)fdt_add_cpu_nodes (vbi);fdt_add_psci_node (vbi); -memory_region_init_ram (ram,NULL ,"mach-virt.ram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mach-virt.ram" , + machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem, vbi->memmap[VIRT_MEM ].base, ram);hw/arm/xilinx_zynq.c +2
-2@@ -149,12 +149,12 @@ static void zynq_init(MachineState *machine) }/* DDR remapped to address zero. */ -memory_region_init_ram (ext_ram,NULL ,"zynq.ext_ram" , ram_size); +memory_region_init_ram_nofail (ext_ram,NULL ,"zynq.ext_ram" , ram_size);vmstate_register_ram_global (ext_ram);memory_region_add_subregion (address_space_mem,0 , ext_ram);/* 256K of on-chip memory */ -memory_region_init_ram (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 ); +memory_region_init_ram_nofail (ocm_ram,NULL ,"zynq.ocm_ram" ,256 <<10 );vmstate_register_ram_global (ocm_ram);memory_region_add_subregion (address_space_mem,0xFFFC0000 , ocm_ram);hw/block/onenand.c +1
-1@@ -788,7 +788,7 @@ static int onenand_initfn(SysBusDevice *sbd) } s->otp =memset (g_malloc ((64 +2 ) <<PAGE_SHIFT ),0xff , (64 +2 ) <<PAGE_SHIFT ); -memory_region_init_ram (&s->ram,OBJECT (s),"onenand.ram" , +memory_region_init_ram_nofail (&s->ram,OBJECT (s),"onenand.ram" ,0xc000 << s->shift);vmstate_register_ram_global (&s->ram); ram =memory_region_get_ram_ptr (&s->ram);hw/core/loader.c +1
-1@@ -632,7 +632,7 @@ static void *rom_set_mr(Rom *rom, Object *owner, const char *name)void *data; rom->mr =g_malloc (sizeof (*rom->mr)); -memory_region_init_ram (rom->mr, owner, name, rom->datasize); +memory_region_init_ram_nofail (rom->mr, owner, name, rom->datasize);memory_region_set_readonly (rom->mr, true);vmstate_register_ram_global (rom->mr);hw/cris/axis_dev88.c +3
-2@@ -270,13 +270,14 @@ void axisdev88_init(MachineState *machine) env = &cpu->env;/* allocate RAM */ -memory_region_init_ram (phys_ram,NULL ,"axisdev88.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"axisdev88.ram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem,0x40000000 , phys_ram);/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the internal memory. */ -memory_region_init_ram (phys_intmem,NULL ,"axisdev88.chipram" ,INTMEM_SIZE ); +memory_region_init_ram_nofail (phys_intmem,NULL ,"axisdev88.chipram" , +INTMEM_SIZE );vmstate_register_ram_global (phys_intmem);memory_region_add_subregion (address_space_mem,0x38000000 , phys_intmem);hw/display/cg3.c +3
-2@@ -279,7 +279,8 @@ static void cg3_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);CG3State *s =CG3 (obj); -memory_region_init_ram (&s->rom,NULL ,"cg3.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"cg3.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);@@ -306,7 +307,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp) } } -memory_region_init_ram (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram_mem,NULL ,"cg3.vram" , s->vram_size);vmstate_register_ram_global (&s->vram_mem);sysbus_init_mmio (sbd, &s->vram_mem);hw/display/qxl.c +3
-3@@ -1978,14 +1978,14 @@ static int qxl_init_common(PCIQXLDevice *qxl)pci_set_byte (&config[PCI_INTERRUPT_PIN ],1 ); qxl->rom_size =qxl_rom_size (); -memory_region_init_ram (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , +memory_region_init_ram_nofail (&qxl->rom_bar,OBJECT (qxl),"qxl.vrom" , qxl->rom_size);vmstate_register_ram (&qxl->rom_bar, &qxl->pci.qdev);init_qxl_rom (qxl);init_qxl_ram (qxl); qxl->guest_surfaces.cmds =g_new0 (QXLPHYSICAL , qxl->ssd.num_surfaces); -memory_region_init_ram (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , +memory_region_init_ram_nofail (&qxl->vram_bar,OBJECT (qxl),"qxl.vram" , qxl->vram_size);vmstate_register_ram (&qxl->vram_bar, &qxl->pci.qdev); memory_region_init_alias(&qxl->vram32_bar, OBJECT(qxl), "qxl.vram32",@@ -2093,7 +2093,7 @@ static int qxl_init_secondary(PCIDevice *dev) qxl->id = device_id++;qxl_init_ramsize (qxl); -memory_region_init_ram (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , +memory_region_init_ram_nofail (&qxl->vga.vram,OBJECT (dev),"qxl.vgavram" , qxl->vga.vram_size);vmstate_register_ram (&qxl->vga.vram, &qxl->pci.qdev); qxl->vga.vram_ptr =memory_region_get_ram_ptr (&qxl->vga.vram);hw/display/sm501.c +1
-1@@ -1409,7 +1409,7 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t base, s->dc_crt_control =0x00010000 ;/* allocate local memory */ -memory_region_init_ram (&s->local_mem_region,NULL ,"sm501.local" , +memory_region_init_ram_nofail (&s->local_mem_region,NULL ,"sm501.local" , local_mem_bytes);vmstate_register_ram_global (&s->local_mem_region); s->local_mem =memory_region_get_ram_ptr (&s->local_mem_region);hw/display/tc6393xb.c +1
-1@@ -581,7 +581,7 @@ TC6393xbState *tc6393xb_init(MemoryRegion *sysmem, uint32_t base, qemu_irq irq)memory_region_init_io (&s->iomem,NULL , &tc6393xb_ops, s,"tc6393xb" ,0x10000 );memory_region_add_subregion (sysmem, base, &s->iomem); -memory_region_init_ram (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 ); +memory_region_init_ram_nofail (&s->vram,NULL ,"tc6393xb.vram" ,0x100000 );vmstate_register_ram_global (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);memory_region_add_subregion (sysmem, base +0x100000 , &s->vram);hw/display/tcx.c +3
-2@@ -535,7 +535,8 @@ static void tcx_initfn(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);TCXState *s =TCX (obj); -memory_region_init_ram (&s->rom,NULL ,"tcx.prom" ,FCODE_MAX_ROM_SIZE ); +memory_region_init_ram_nofail (&s->rom,NULL ,"tcx.prom" , +FCODE_MAX_ROM_SIZE );memory_region_set_readonly (&s->rom, true);sysbus_init_mmio (sbd, &s->rom);@@ -566,7 +567,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)uint8_t *vram_base;char *fcode_filename; -memory_region_init_ram (&s->vram_mem,OBJECT (s),"tcx.vram" , +memory_region_init_ram_nofail (&s->vram_mem,OBJECT (s),"tcx.vram" , s->vram_size * (1 +4 +4 ));vmstate_register_ram_global (&s->vram_mem); vram_base =memory_region_get_ram_ptr (&s->vram_mem);hw/display/vga.c +1
-1@@ -2291,7 +2291,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) s->vram_size_mb = s->vram_size >>20 ; s->is_vbe_vmstate =1 ; -memory_region_init_ram (&s->vram, obj,"vga.vram" , s->vram_size); +memory_region_init_ram_nofail (&s->vram, obj,"vga.vram" , s->vram_size);vmstate_register_ram (&s->vram, global_vmstate ?NULL :DEVICE (obj));xen_register_framebuffer (&s->vram); s->vram_ptr =memory_region_get_ram_ptr (&s->vram);hw/display/vmware_vga.c +2
-1@@ -1201,7 +1201,8 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, s->vga.con =graphic_console_init (dev,0 , &vmsvga_ops, s); s->fifo_size =SVGA_FIFO_SIZE ; -memory_region_init_ram (&s->fifo_ram,NULL ,"vmsvga.fifo" , s->fifo_size); +memory_region_init_ram_nofail (&s->fifo_ram,NULL ,"vmsvga.fifo" , + s->fifo_size);vmstate_register_ram_global (&s->fifo_ram); s->fifo_ptr =memory_region_get_ram_ptr (&s->fifo_ram);hw/i386/kvm/pci-assign.c +1
-1@@ -1943,7 +1943,7 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (dev))); -memory_region_init_ram (&dev->dev.rom,OBJECT (dev), name, st.st_size); +memory_region_init_ram_nofail (&dev->dev.rom,OBJECT (dev), name, st.st_size);vmstate_register_ram (&dev->dev.rom, &dev->dev.qdev); ptr =memory_region_get_ram_ptr (&dev->dev.rom);memset (ptr,0xff , st.st_size);hw/i386/pc.c +1
-1@@ -1272,7 +1272,7 @@ FWCfgState *pc_memory_init(MachineState *machine,pc_system_firmware_init (rom_memory, guest_info->isapc_ram_fw); option_rom_mr =g_malloc (sizeof (*option_rom_mr)); -memory_region_init_ram (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE ); +memory_region_init_ram_nofail (option_rom_mr,NULL ,"pc.rom" ,PC_ROM_SIZE );vmstate_register_ram_global (option_rom_mr); memory_region_add_subregion_overlap(rom_memory, PC_ROM_MIN_VGA,hw/i386/pc_sysfw.c +2
-2@@ -55,7 +55,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory,/* map the last 128KB of the BIOS in ISA space */ isa_bios_size =MIN (flash_size,128 *1024 ); isa_bios =g_malloc (sizeof (*isa_bios)); -memory_region_init_ram (isa_bios,NULL ,"isa-bios" , isa_bios_size); +memory_region_init_ram_nofail (isa_bios,NULL ,"isa-bios" , isa_bios_size);vmstate_register_ram_global (isa_bios); memory_region_add_subregion_overlap(rom_memory, 0x100000 - isa_bios_size,@@ -192,7 +192,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) goto bios_error; } bios =g_malloc (sizeof (*bios)); -memory_region_init_ram (bios,NULL ,"pc.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"pc.bios" , bios_size);vmstate_register_ram_global (bios);if (!isapc_ram_fw) {memory_region_set_readonly (bios, true);hw/input/milkymist-softusb.c +2
-2@@ -249,12 +249,12 @@ static int milkymist_softusb_init(SysBusDevice *dev)sysbus_init_mmio (dev, &s->regs_region);/* register pmem and dmem */ -memory_region_init_ram (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , +memory_region_init_ram_nofail (&s->pmem,OBJECT (s),"milkymist-softusb.pmem" , s->pmem_size);vmstate_register_ram_global (&s->pmem); s->pmem_ptr =memory_region_get_ram_ptr (&s->pmem);sysbus_init_mmio (dev, &s->pmem); -memory_region_init_ram (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , +memory_region_init_ram_nofail (&s->dmem,OBJECT (s),"milkymist-softusb.dmem" , s->dmem_size);vmstate_register_ram_global (&s->dmem); s->dmem_ptr =memory_region_get_ram_ptr (&s->dmem);hw/lm32/lm32_boards.c +3
-2@@ -111,7 +111,7 @@ static void lm32_evr_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_evr.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_evr.sdram" , ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);@@ -213,7 +213,8 @@ static void lm32_uclinux_init(MachineState *machine) reset_info->flash_base = flash_base; -memory_region_init_ram (phys_ram,NULL ,"lm32_uclinux.sdram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"lm32_uclinux.sdram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ram_base, phys_ram);hw/lm32/milkymist.c +2
-1@@ -118,7 +118,8 @@ milkymist_init(MachineState *machine)cpu_lm32_set_phys_msb_ignore (env,1 ); -memory_region_init_ram (phys_sdram,NULL ,"milkymist.sdram" , sdram_size); +memory_region_init_ram_nofail (phys_sdram,NULL ,"milkymist.sdram" , + sdram_size);vmstate_register_ram_global (phys_sdram);memory_region_add_subregion (address_space_mem, sdram_base, phys_sdram);hw/m68k/an5206.c +2
-2@@ -50,12 +50,12 @@ static void an5206_init(MachineState *machine) env->rambar0 =AN5206_RAMBAR_ADDR |1 ;/* DRAM at address zero */ -memory_region_init_ram (ram,NULL ,"an5206.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"an5206.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"an5206.sram" ,512 ); +memory_region_init_ram_nofail (sram,NULL ,"an5206.sram" ,512 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,AN5206_RAMBAR_ADDR , sram);hw/m68k/dummy_m68k.c +1
-1@@ -40,7 +40,7 @@ static void dummy_m68k_init(MachineState *machine) env->vbr =0 ;/* RAM at address zero */ -memory_region_init_ram (ram,NULL ,"dummy_m68k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"dummy_m68k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);hw/m68k/mcf5208.c +2
-2@@ -218,12 +218,12 @@ static void mcf5208evb_init(MachineState *machine)/* TODO: Configure BARs. */ /* DRAM at 0x40000000 */ -memory_region_init_ram (ram,NULL ,"mcf5208.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mcf5208.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Internal SRAM. */ -memory_region_init_ram (sram,NULL ,"mcf5208.sram" ,16384 ); +memory_region_init_ram_nofail (sram,NULL ,"mcf5208.sram" ,16384 );vmstate_register_ram_global (sram);memory_region_add_subregion (address_space_mem,0x80000000 , sram);hw/microblaze/petalogix_ml605_mmu.c +4
-3@@ -99,12 +99,13 @@ petalogix_ml605_init(MachineState *machine)object_property_set_bool (OBJECT (cpu), true,"realized" , &error_abort);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL ,"petalogix_ml605.lmb_bram" , -LMB_BRAM_SIZE ); +memory_region_init_ram_nofail (phys_lmb_bram,NULL , +"petalogix_ml605.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (address_space_mem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_ml605.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_ml605.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (address_space_mem, ddr_base, phys_ram);hw/microblaze/petalogix_s3adsp1800_mmu.c +3
-2@@ -80,12 +80,13 @@ petalogix_s3adsp1800_init(MachineState *machine) cpu =cpu_mb_init (cpu_model);/* Attach emulated BRAM through the LMB. */ -memory_region_init_ram (phys_lmb_bram,NULL , +memory_region_init_ram_nofail (phys_lmb_bram,NULL ,"petalogix_s3adsp1800.lmb_bram" ,LMB_BRAM_SIZE );vmstate_register_ram_global (phys_lmb_bram);memory_region_add_subregion (sysmem,0x00000000 , phys_lmb_bram); -memory_region_init_ram (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , ram_size); +memory_region_init_ram_nofail (phys_ram,NULL ,"petalogix_s3adsp1800.ram" , + ram_size);vmstate_register_ram_global (phys_ram);memory_region_add_subregion (sysmem, ddr_base, phys_ram);hw/mips/mips_fulong2e.c +2
-2@@ -302,9 +302,9 @@ static void mips_fulong2e_init(MachineState *machine) bios_size =1024 *1024 ;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"fulong2e.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"fulong2e.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"fulong2e.bios" , bios_size); +memory_region_init_ram_nofail (bios,NULL ,"fulong2e.bios" , bios_size);vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);hw/mips/mips_jazz.c +4
-3@@ -179,11 +179,12 @@ static void mips_jazz_init(MemoryRegion *address_space, cc->do_unassigned_access = mips_jazz_do_unassigned_access;/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"mips_jazz.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_jazz.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space,0 , ram); -memory_region_init_ram (bios,NULL ,"mips_jazz.bios" ,MAGNUM_BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_jazz.bios" , +MAGNUM_BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true); memory_region_init_alias(bios2, NULL, "mips_jazz.bios", bios,@@ -244,7 +245,7 @@ static void mips_jazz_init(MemoryRegion *address_space, {/* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr =g_new (MemoryRegion,1 ); -memory_region_init_ram (rom_mr,NULL ,"g364fb.rom" ,0x80000 ); +memory_region_init_ram_nofail (rom_mr,NULL ,"g364fb.rom" ,0x80000 );vmstate_register_ram_global (rom_mr);memory_region_set_readonly (rom_mr, true);uint8_t *rom =memory_region_get_ram_ptr (rom_mr);hw/mips/mips_malta.c +2
-2@@ -992,7 +992,7 @@ void mips_malta_init(MachineState *machine) }/* register RAM at high address where it is undisturbed by IO */ -memory_region_init_ram (ram_high,NULL ,"mips_malta.ram" , ram_size); +memory_region_init_ram_nofail (ram_high,NULL ,"mips_malta.ram" , ram_size);vmstate_register_ram_global (ram_high);memory_region_add_subregion (system_memory,0x80000000 , ram_high);@@ -1116,7 +1116,7 @@ void mips_malta_init(MachineState *machine)* handled by an overlapping region as the resulting ROM code subpage * regions are not executable. */ -memory_region_init_ram (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios_copy,NULL ,"bios.1fc" ,BIOS_SIZE );if (!rom_copy (memory_region_get_ram_ptr (bios_copy),FLASH_ADDRESS ,BIOS_SIZE )) { memcpy(memory_region_get_ram_ptr(bios_copy),hw/mips/mips_mipssim.c +2
-2@@ -171,9 +171,9 @@ mips_mipssim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"mips_mipssim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_mipssim.ram" , ram_size);vmstate_register_ram_global (ram); -memory_region_init_ram (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_mipssim.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);hw/mips/mips_r4k.c +2
-2@@ -204,7 +204,7 @@ void mips_r4k_init(MachineState *machine) ((unsigned int)ram_size / (1 << 20)));exit (1 ); } -memory_region_init_ram (ram,NULL ,"mips_r4k.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"mips_r4k.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0 , ram);@@ -231,7 +231,7 @@ void mips_r4k_init(MachineState *machine)#endif if ((bios_size >0 ) && (bios_size <=BIOS_SIZE )) { bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"mips_r4k.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);memory_region_set_readonly (bios, true);memory_region_add_subregion (get_system_memory (),0x1fc00000 , bios);hw/moxie/moxiesim.c +2
-2@@ -123,11 +123,11 @@ static void moxiesim_init(MachineState *machine)qemu_register_reset (main_cpu_reset, cpu);/* Allocate RAM. */ -memory_region_init_ram (ram,NULL ,"moxiesim.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"moxiesim.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem, ram_base, ram); -memory_region_init_ram (rom,NULL ,"moxie.rom" ,128 *0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"moxie.rom" ,128 *0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0x1000 , rom);hw/net/milkymist-minimac2.c +2
-2@@ -471,8 +471,8 @@ static int milkymist_minimac2_init(SysBusDevice *sbd)sysbus_init_mmio (sbd, &s->regs_region);/* register buffers memory */ -memory_region_init_ram (&s->buffers,OBJECT (dev),"milkymist-minimac2.buffers" , - buffers_size); +memory_region_init_ram_nofail (&s->buffers,OBJECT (dev), +"milkymist-minimac2.buffers" , buffers_size);vmstate_register_ram_global (&s->buffers); s->rx0_buf =memory_region_get_ram_ptr (&s->buffers); s->rx1_buf = s->rx0_buf +MINIMAC2_BUFFER_SIZE ;hw/openrisc/openrisc_sim.c +1
-1@@ -114,7 +114,7 @@ static void openrisc_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"openrisc.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"openrisc.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram);hw/pci-host/prep.c +1
-1@@ -299,7 +299,7 @@ static int raven_init(PCIDevice *d) d->config[0x0D ] =0x10 ;// latency_timer d->config[0x34 ] =0x00 ;// capabilities_pointer -memory_region_init_ram (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE );memory_region_set_readonly (&s->bios, true);memory_region_add_subregion (get_system_memory (), (uint32_t )(-BIOS_SIZE ), &s->bios);hw/pci/pci.c +1
-1@@ -1974,7 +1974,7 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom)snprintf (name,sizeof (name),"%s.rom" ,object_get_typename (OBJECT (pdev))); } pdev->has_rom = true; -memory_region_init_ram (&pdev->rom,OBJECT (pdev), name, size); +memory_region_init_ram_nofail (&pdev->rom,OBJECT (pdev), name, size);vmstate_register_ram (&pdev->rom, &pdev->qdev); ptr =memory_region_get_ram_ptr (&pdev->rom);load_image (path, ptr);hw/ppc/mac_newworld.c +1
-1@@ -204,7 +204,7 @@ static void ppc_core99_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_core99.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )hw/ppc/mac_oldworld.c +1
-1@@ -135,7 +135,7 @@ static void ppc_heathrow_init(MachineState *machine)memory_region_add_subregion (sysmem,0 , ram);/* allocate and load BIOS */ -memory_region_init_ram (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ppc_heathrow.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )hw/ppc/ppc405_boards.c +4
-3@@ -214,7 +214,7 @@ static void ref405ep_init(MachineState *machine) 33333333, &pic, kernel_filename == NULL ? 0 : 1);/* allocate SRAM */ sram_size =512 *1024 ; -memory_region_init_ram (sram,NULL ,"ef405ep.sram" , sram_size); +memory_region_init_ram_nofail (sram,NULL ,"ef405ep.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (sysmem,0xFFF00000 , sram);/* allocate and load BIOS */ @@ -246,7 +246,7 @@ static void ref405ep_init(MachineState *machine)printf ("Load BIOS from file\n" );#endif bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"ef405ep.bios" ,BIOS_SIZE );vmstate_register_ram_global (bios);if (bios_name ==NULL )@@ -572,7 +572,8 @@ static void taihu_405ep_init(MachineState *machine)if (bios_name ==NULL ) bios_name =BIOS_FILENAME ; bios =g_new (MemoryRegion,1 ); -memory_region_init_ram (bios,NULL ,"taihu_405ep.bios" ,BIOS_SIZE ); +memory_region_init_ram_nofail (bios,NULL ,"taihu_405ep.bios" , +BIOS_SIZE );vmstate_register_ram_global (bios); filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);if (filename) {hw/ppc/ppc405_uc.c +1
-1@@ -974,7 +974,7 @@ static void ppc405_ocm_init(CPUPPCState *env) ocm =g_malloc0 (sizeof (ppc405_ocm_t));/* XXX: Size is 4096 or 0x04000000 */ -memory_region_init_ram (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 ); +memory_region_init_ram_nofail (&ocm->isarc_ram,NULL ,"ppc405.ocm" ,4096 );vmstate_register_ram_global (&ocm->isarc_ram);memory_region_init_alias (&ocm->dsarc_ram,NULL ,"ppc405.dsarc" , &ocm->isarc_ram,0 ,4096 );hw/s390x/s390-virtio-ccw.c +1
-1@@ -110,7 +110,7 @@ static void ccw_init(MachineState *machine)virtio_ccw_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);hw/s390x/s390-virtio.c +1
-1@@ -256,7 +256,7 @@ static void s390_init(MachineState *machine)s390_virtio_register_hcalls ();/* allocate RAM */ -memory_region_init_ram (ram,NULL ,"s390.ram" , my_ram_size); +memory_region_init_ram_nofail (ram,NULL ,"s390.ram" , my_ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (sysmem,0 , ram);hw/sh4/r2d.c +1
-1@@ -255,7 +255,7 @@ static void r2d_init(MachineState *machine)qemu_register_reset (main_cpu_reset, reset_info);/* Allocate memory space */ -memory_region_init_ram (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE ); +memory_region_init_ram_nofail (sdram,NULL ,"r2d.sdram" ,SDRAM_SIZE );vmstate_register_ram_global (sdram);memory_region_add_subregion (address_space_mem,SDRAM_BASE , sdram);/* Register peripherals */ hw/sh4/shix.c +3
-3@@ -59,14 +59,14 @@ static void shix_init(MachineState *machine) }/* Allocate memory space */ -memory_region_init_ram (rom,NULL ,"shix.rom" ,0x4000 ); +memory_region_init_ram_nofail (rom,NULL ,"shix.rom" ,0x4000 );vmstate_register_ram_global (rom);memory_region_set_readonly (rom, true);memory_region_add_subregion (sysmem,0x00000000 , rom); -memory_region_init_ram (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[0 ],NULL ,"shix.sdram1" ,0x01000000 );vmstate_register_ram_global (&sdram[0 ]);memory_region_add_subregion (sysmem,0x08000000 , &sdram[0 ]); -memory_region_init_ram (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 ); +memory_region_init_ram_nofail (&sdram[1 ],NULL ,"shix.sdram2" ,0x01000000 );vmstate_register_ram_global (&sdram[1 ]);memory_region_add_subregion (sysmem,0x0c000000 , &sdram[1 ]);hw/sparc/leon3.c +2
-2@@ -151,13 +151,13 @@ static void leon3_generic_hw_init(MachineState *machine)exit (1 ); } -memory_region_init_ram (ram,NULL ,"leon3.ram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"leon3.ram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (address_space_mem,0x40000000 , ram);/* Allocate BIOS */ prom_size =8 *1024 *1024 ;/* 8Mb */ -memory_region_init_ram (prom,NULL ,"Leon3.bios" , prom_size); +memory_region_init_ram_nofail (prom,NULL ,"Leon3.bios" , prom_size);vmstate_register_ram_global (prom);memory_region_set_readonly (prom, true);memory_region_add_subregion (address_space_mem,0x00000000 , prom);hw/sparc/sun4m.c +5
-4@@ -620,7 +620,7 @@ static int idreg_init1(SysBusDevice *dev) {IDRegState *s =MACIO_ID_REGISTER (dev); -memory_region_init_ram (&s->mem,OBJECT (s), +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.idreg" ,sizeof (idreg_data));vmstate_register_ram_global (&s->mem);memory_region_set_readonly (&s->mem, true);@@ -668,7 +668,7 @@ static int afx_init1(SysBusDevice *dev) {AFXState *s =TCX_AFX (dev); -memory_region_init_ram (&s->mem,OBJECT (s),"sun4m.afx" ,4 ); +memory_region_init_ram_nofail (&s->mem,OBJECT (s),"sun4m.afx" ,4 );vmstate_register_ram_global (&s->mem);sysbus_init_mmio (dev, &s->mem);return 0 ;@@ -742,7 +742,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4m.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4m.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);@@ -784,7 +785,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4M_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4m.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4m.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;hw/sparc64/sun4u.c +3
-2@@ -686,7 +686,8 @@ static int prom_init1(SysBusDevice *dev) {PROMState *s =OPENPROM (dev); -memory_region_init_ram (&s->prom,OBJECT (s),"sun4u.prom" ,PROM_SIZE_MAX ); +memory_region_init_ram_nofail (&s->prom,OBJECT (s),"sun4u.prom" , +PROM_SIZE_MAX );vmstate_register_ram_global (&s->prom);memory_region_set_readonly (&s->prom, true);sysbus_init_mmio (dev, &s->prom);@@ -729,7 +730,7 @@ static int ram_init1(SysBusDevice *dev) {RamDevice *d =SUN4U_RAM (dev); -memory_region_init_ram (&d->ram,OBJECT (d),"sun4u.ram" , d->size); +memory_region_init_ram_nofail (&d->ram,OBJECT (d),"sun4u.ram" , d->size);vmstate_register_ram_global (&d->ram);sysbus_init_mmio (dev, &d->ram);return 0 ;hw/unicore32/puv3.c +1
-1@@ -74,7 +74,7 @@ static void puv3_board_init(CPUUniCore32State *env, ram_addr_t ram_size)MemoryRegion *ram_memory =g_new (MemoryRegion,1 );/* SDRAM at address zero. */ -memory_region_init_ram (ram_memory,NULL ,"puv3.ram" , ram_size); +memory_region_init_ram_nofail (ram_memory,NULL ,"puv3.ram" , ram_size);vmstate_register_ram_global (ram_memory);memory_region_add_subregion (get_system_memory (),0 , ram_memory); }hw/xtensa/sim.c +2
-2@@ -79,12 +79,12 @@ static void xtensa_sim_init(MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"xtensa.sram" , ram_size); +memory_region_init_ram_nofail (ram,NULL ,"xtensa.sram" , ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (get_system_memory (),0 , ram); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"xtensa.rom" ,0x1000 ); +memory_region_init_ram_nofail (rom,NULL ,"xtensa.rom" ,0x1000 );vmstate_register_ram_global (rom);memory_region_add_subregion (get_system_memory (),0xfe000000 , rom);hw/xtensa/xtfpga.c +3
-3@@ -143,7 +143,7 @@ static void lx60_net_init(MemoryRegion *address_space, sysbus_mmio_get_region(s, 1)); ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,OBJECT (s),"open_eth.ram" ,16384 ); +memory_region_init_ram_nofail (ram,OBJECT (s),"open_eth.ram" ,16384 );vmstate_register_ram_global (ram);memory_region_add_subregion (address_space, buffers, ram); }@@ -205,7 +205,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine) } ram =g_malloc (sizeof (*ram)); -memory_region_init_ram (ram,NULL ,"lx60.dram" , machine->ram_size); +memory_region_init_ram_nofail (ram,NULL ,"lx60.dram" , machine->ram_size);vmstate_register_ram_global (ram);memory_region_add_subregion (system_memory,0 , ram);@@ -254,7 +254,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)uint32_t cur_lowmem =QEMU_ALIGN_UP (lowmem_end /2 ,4096 ); rom =g_malloc (sizeof (*rom)); -memory_region_init_ram (rom,NULL ,"lx60.sram" , board->sram_size); +memory_region_init_ram_nofail (rom,NULL ,"lx60.sram" , board->sram_size);vmstate_register_ram_global (rom);memory_region_add_subregion (system_memory,0xfe000000 , rom);include/exec/memory.h +6
-6@@ -321,18 +321,18 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, Error **errp);/** -* memory_region_init_ram: Initialize RAM memory region. Accesses into the -* region will modify memory directly. +* memory_region_init_ram_nofail: Initialize RAM memory region. Accesses into +* the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. */ -void memory_region_init_ram (MemoryRegion *mr, -struct Object *owner, -const char *name, -uint64_t size); +void memory_region_init_ram_nofail (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size);#ifdef __linux__/** memory.c +4
-4@@ -1174,10 +1174,10 @@ void memory_region_init_ram_may_fail(MemoryRegion *mr, mr->ram_addr =qemu_ram_alloc (size, mr, errp); } -void memory_region_init_ram (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size) +void memory_region_init_ram_nofail (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size) {Error *local_err =NULL ;numa.c +2
-2@@ -263,14 +263,14 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,if (err) {qerror_report_err (err);error_free (err); -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }#else fprintf (stderr,"-mem-path not supported on this host\n" );exit (1 );#endif }else { -memory_region_init_ram (mr, owner, name, ram_size); +memory_region_init_ram_nofail (mr, owner, name, ram_size); }vmstate_register_ram_global (mr); }xen-hvm.c +1
-2@@ -188,7 +188,7 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size,*/ block_len = (1ULL <<32 ) + *above_4g_mem_size; } -memory_region_init_ram (&ram_memory,NULL ,"xen.ram" , block_len); +memory_region_init_ram_nofail (&ram_memory,NULL ,"xen.ram" , block_len); *ram_memory_p = &ram_memory;vmstate_register_ram_global (&ram_memory); --1.9.3
PATCH v4 4/6 rename memory_region_init_ram_may_fail to memory_region_init_ram
In reply to Hu TaoSigned-off-by Hu Tao <[email protected]>
--- backends/hostmem-ram.c | 4 ++-- include/exec/memory.h | 15 +++++++-------- memory.c | 12 ++++++------ 3 files changed, 15 insertions(+), 16 deletions(-)
backends/hostmem-ram.c +2 -2
@@ -26,8 +26,8 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } path =object_get_canonical_path_component (OBJECT (backend)); -memory_region_init_ram_may_fail (&backend->mr,OBJECT (backend), path, - backend->size, errp); +memory_region_init_ram (&backend->mr,OBJECT (backend), path, + backend->size, errp);g_free (path); }
include/exec/memory.h +7 -8
@@ -304,9 +304,8 @@ void memory_region_init_io(MemoryRegion *mr, uint64_t size);/** -* memory_region_init_ram_may_fail: Initialize RAM memory region. Accesses -* into the region will modify memory -* directly. +* memory_region_init_ram: Initialize RAM memory region. Accesses +* into the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count
@@ -314,11 +313,11 @@ void memory_region_init_io(MemoryRegion *mr,* @size: size of the region. * @errp: pointer to Error*, to store an error if it happens. */ -void memory_region_init_ram_may_fail (MemoryRegion *mr, -struct Object *owner, -const char *name, -uint64_t size, -Error **errp); +void memory_region_init_ram (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size, +Error **errp);/** * memory_region_init_ram_nofail: Initialize RAM memory region. Accesses into
memory.c +6 -6
@@ -1161,11 +1161,11 @@ void memory_region_init_io(MemoryRegion *mr, mr->ram_addr = ~(ram_addr_t )0 ; } -void memory_region_init_ram_may_fail (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size, -Error **errp) +void memory_region_init_ram (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size, +Error **errp) {memory_region_init (mr, owner, name, size); mr->ram = true;
@@ -1181,7 +1181,7 @@ void memory_region_init_ram_nofail(MemoryRegion *mr, {Error *local_err =NULL ; -memory_region_init_ram_may_fail (mr, owner, name, size, &local_err); +memory_region_init_ram (mr, owner, name, size, &local_err);if (local_err) {error_report ("%s" ,error_get_pretty (local_err));
Signature · 1 line
1.9.3
PATCH v4 5/6 rename memory_region_init_ram_ptr to memory_region_init_ram_ptr_nofail
In reply to Hu TaoSigned-off-by Hu Tao <[email protected]>
--- hw/display/g364fb.c | 4 ++-- hw/i386/kvm/pci-assign.c | 3 ++- hw/misc/ivshmem.c | 9 +++++---- hw/misc/vfio.c | 3 ++- hw/ppc/spapr.c | 4 ++-- include/exec/memory.h | 16 ++++++++-------- memory.c | 10 +++++----- 7 files changed, 26 insertions(+), 23 deletions(-)
hw/display/g364fb.c +2 -2
@@ -486,8 +486,8 @@ static void g364fb_init(DeviceState *dev, G364State *s) s->con =graphic_console_init (dev,0 , &g364fb_ops, s);memory_region_init_io (&s->mem_ctrl,NULL , &g364fb_ctrl_ops, s,"ctrl" ,0x180000 ); -memory_region_init_ram_ptr (&s->mem_vram,NULL ,"vram" , - s->vram_size, s->vram); +memory_region_init_ram_ptr_nofail (&s->mem_vram,NULL ,"vram" , + s->vram_size, s->vram);vmstate_register_ram (&s->mem_vram, dev);memory_region_set_coalescing (&s->mem_vram); }
hw/i386/kvm/pci-assign.c +2 -1
@@ -454,7 +454,8 @@ static void assigned_dev_register_regions(PCIRegion *io_regions,char name[32 ];snprintf (name,sizeof (name),"%s.bar%d" ,object_get_typename (OBJECT (pci_dev)), i); -memory_region_init_ram_ptr (&pci_dev->v_addrs[i].real_iomem, +memory_region_init_ram_ptr_nofail ( + &pci_dev->v_addrs[i].real_iomem,OBJECT (pci_dev), name, cur_region->size, virtbase); vmstate_register_ram(&pci_dev->v_addrs[i].real_iomem,
hw/misc/ivshmem.c +5 -4
@@ -347,8 +347,8 @@ static void create_shared_memory_BAR(IVShmemState *s, int fd) { ptr =mmap (0 , s->ivshmem_size,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 ); -memory_region_init_ram_ptr (&s->ivshmem,OBJECT (s),"ivshmem.bar2" , - s->ivshmem_size, ptr); +memory_region_init_ram_ptr_nofail (&s->ivshmem,OBJECT (s),"ivshmem.bar2" , + s->ivshmem_size, ptr);vmstate_register_ram (&s->ivshmem,DEVICE (s));memory_region_add_subregion (&s->bar,0 , &s->ivshmem);
@@ -475,8 +475,9 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags)/* mmap the region and map into the BAR2 */ map_ptr =mmap (0 , s->ivshmem_size,PROT_READ |PROT_WRITE ,MAP_SHARED , incoming_fd,0 ); -memory_region_init_ram_ptr (&s->ivshmem,OBJECT (s), -"ivshmem.bar2" , s->ivshmem_size, map_ptr); +memory_region_init_ram_ptr_nofail (&s->ivshmem,OBJECT (s), +"ivshmem.bar2" , s->ivshmem_size, + map_ptr);vmstate_register_ram (&s->ivshmem,DEVICE (s)); IVSHMEM_DPRINTF("guest h/w addr = %" PRIu64 ", size = %" PRIu64 "\n",
hw/misc/vfio.c +2 -1
@@ -2894,7 +2894,8 @@ static int vfio_mmap_bar(VFIODevice *vdev, VFIOBAR *bar, goto empty_region; } -memory_region_init_ram_ptr (submem,OBJECT (vdev), name, size, *map); +memory_region_init_ram_ptr_nofail (submem,OBJECT (vdev), name, size, + *map); }else { empty_region:/* Create a zero sized sub-region to make cleanup easy. */
hw/ppc/spapr.c +2 -2
@@ -1341,8 +1341,8 @@ static void ppc_spapr_init(MachineState *machine)if (rma_alloc_size && rma) { rma_region =g_new (MemoryRegion,1 ); -memory_region_init_ram_ptr (rma_region,NULL ,"ppc_spapr.rma" , - rma_alloc_size, rma); +memory_region_init_ram_ptr_nofail (rma_region,NULL ,"ppc_spapr.rma" , + rma_alloc_size, rma);vmstate_register_ram_global (rma_region);memory_region_add_subregion (sysmem,0 , rma_region); }
include/exec/memory.h +8 -8
@@ -375,9 +375,9 @@ void memory_region_init_ram_ptr_may_fail(MemoryRegion *mr, Error **errp);/** -* memory_region_init_ram_ptr: Initialize RAM memory region from a -* user-provided pointer. Accesses into the -* region will modify memory directly. +* memory_region_init_ram_ptr_nofail: Initialize RAM memory region from a +* user-provided pointer. Accesses into the +* region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count
@@ -385,11 +385,11 @@ void memory_region_init_ram_ptr_may_fail(MemoryRegion *mr,* @size: size of the region. * @ptr: memory to be mapped; must contain at least @size bytes. */ -void memory_region_init_ram_ptr (MemoryRegion *mr, -struct Object *owner, -const char *name, -uint64_t size, -void *ptr); +void memory_region_init_ram_ptr_nofail (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size, +void *ptr);/** * memory_region_init_alias: Initialize a memory region that aliases all or a
memory.c +5 -5
@@ -1221,11 +1221,11 @@ void memory_region_init_ram_ptr_may_fail(MemoryRegion *mr, mr->ram_addr =qemu_ram_alloc_from_ptr (size, ptr, mr, errp); } -void memory_region_init_ram_ptr (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size, -void *ptr) +void memory_region_init_ram_ptr_nofail (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size, +void *ptr) {Error *local_err =NULL ;
Signature · 1 line
1.9.3
PATCH v4 6/6 rename memory_region_init_ram_ptr_may_fail to memory_region_init_ram_ptr
In reply to Hu TaoSigned-off-by Hu Tao <[email protected]>
--- include/exec/memory.h | 18 +++++++++--------- memory.c | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-)
include/exec/memory.h +9 -9
@@ -356,9 +356,9 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,#endif /** -* memory_region_init_ram_ptr_may_fail: Initialize RAM memory region from a -* user-provided pointer. Accesses into -* the region will modify memory directly. +* memory_region_init_ram_ptr: Initialize RAM memory region from a +* user-provided pointer. Accesses into +* the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count
@@ -367,12 +367,12 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,* @ptr: memory to be mapped; must contain at least @size bytes. * @errp: pointer to Error*, to store an error if it happens. */ -void memory_region_init_ram_ptr_may_fail (MemoryRegion *mr, -struct Object *owner, -const char *name, -uint64_t size, -void *ptr, -Error **errp); +void memory_region_init_ram_ptr (MemoryRegion *mr, +struct Object *owner, +const char *name, +uint64_t size, +void *ptr, +Error **errp);/** * memory_region_init_ram_ptr_nofail: Initialize RAM memory region from a
memory.c +7 -7
@@ -1207,12 +1207,12 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, }#endif -void memory_region_init_ram_ptr_may_fail (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size, -void *ptr, -Error **errp) +void memory_region_init_ram_ptr (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size, +void *ptr, +Error **errp) {memory_region_init (mr, owner, name, size); mr->ram = true;
@@ -1229,7 +1229,7 @@ void memory_region_init_ram_ptr_nofail(MemoryRegion *mr, {Error *local_err =NULL ; -memory_region_init_ram_ptr_may_fail (mr, owner, name, size, ptr, &local_err); +memory_region_init_ram_ptr (mr, owner, name, size, ptr, &local_err);if (local_err) {error_report ("%s" ,error_get_pretty (local_err));
Signature · 1 line
1.9.3