summaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorHu Tao <hutao@cn.fujitsu.com>2014-09-09 13:27:55 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2014-09-09 13:41:43 +0200
commit49946538d29618319a54e798f22bbcc8065ad106 (patch)
tree0f01a93a81f7091378782956bd17342912731be7 /memory.c
parentef701d7b6f9e33cef11c823b140a0f93e150b27b (diff)
downloadqemu-49946538d29618319a54e798f22bbcc8065ad106.tar.gz
qemu-49946538d29618319a54e798f22bbcc8065ad106.tar.bz2
qemu-49946538d29618319a54e798f22bbcc8065ad106.zip
memory: add parameter errp to memory_region_init_ram
Add parameter errp to memory_region_init_ram and update all call sites to pass in &error_abort. Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> 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 930fa5d162..a2c8f1e5be 100644
--- a/memory.c
+++ b/memory.c
@@ -1142,13 +1142,14 @@ void memory_region_init_io(MemoryRegion *mr,
void memory_region_init_ram(MemoryRegion *mr,
Object *owner,
const char *name,
- uint64_t size)
+ uint64_t size,
+ Error **errp)
{
memory_region_init(mr, owner, name, size);
mr->ram = true;
mr->terminates = true;
mr->destructor = memory_region_destructor_ram;
- mr->ram_addr = qemu_ram_alloc(size, mr, &error_abort);
+ mr->ram_addr = qemu_ram_alloc(size, mr, errp);
}
#ifdef __linux__