summaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorHu Tao <hutao@cn.fujitsu.com>2014-09-09 13:27:57 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2014-09-09 13:41:44 +0200
commit33e0eb5297883444f784a7c22bcf30550a30d601 (patch)
treee7d8d30ba00aae966a66e1ccee39e2822176723b /memory.c
parent49946538d29618319a54e798f22bbcc8065ad106 (diff)
downloadqemu-33e0eb5297883444f784a7c22bcf30550a30d601.tar.gz
qemu-33e0eb5297883444f784a7c22bcf30550a30d601.tar.bz2
qemu-33e0eb5297883444f784a7c22bcf30550a30d601.zip
memory: add parameter errp to memory_region_init_rom_device
Add parameter errp to memory_region_init_rom_device and update all call sites to propagate the error. Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> [Propagate the error out of realize. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/memory.c b/memory.c
index a2c8f1e5be..30f77b2a6a 100644
--- a/memory.c
+++ b/memory.c
@@ -1204,7 +1204,8 @@ void memory_region_init_rom_device(MemoryRegion *mr,
const MemoryRegionOps *ops,
void *opaque,
const char *name,
- uint64_t size)
+ uint64_t size,
+ Error **errp)
{
memory_region_init(mr, owner, name, size);
mr->ops = ops;
@@ -1212,7 +1213,7 @@ void memory_region_init_rom_device(MemoryRegion *mr,
mr->terminates = true;
mr->rom_device = true;
mr->destructor = memory_region_destructor_rom_device;
- mr->ram_addr = qemu_ram_alloc(size, mr, &error_abort);
+ mr->ram_addr = qemu_ram_alloc(size, mr, errp);
}
void memory_region_init_iommu(MemoryRegion *mr,