summaryrefslogtreecommitdiff
path: root/hw/alpha
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 /hw/alpha
parentef701d7b6f9e33cef11c823b140a0f93e150b27b (diff)
downloadqemu-49946538d29618319a54e798f22bbcc8065ad106.tar.gz
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 'hw/alpha')
-rw-r--r--hw/alpha/typhoon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 31947d96d2..53100061d2 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -844,7 +844,8 @@ 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(&s->ram_region, OBJECT(s), "ram", ram_size,
+ &error_abort);
vmstate_register_ram_global(&s->ram_region);
memory_region_add_subregion(addr_space, 0, &s->ram_region);