diff options
| author | Hu Tao <hutao@cn.fujitsu.com> | 2014-09-09 13:27:55 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-09 13:41:43 +0200 |
| commit | 49946538d29618319a54e798f22bbcc8065ad106 (patch) | |
| tree | 0f01a93a81f7091378782956bd17342912731be7 /hw/arm/kzm.c | |
| parent | ef701d7b6f9e33cef11c823b140a0f93e150b27b (diff) | |
| download | hqemu-49946538d29618319a54e798f22bbcc8065ad106.zip hqemu-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/arm/kzm.c')
| -rw-r--r-- | hw/arm/kzm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 0555d12..94ceab6 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -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(ram, NULL, "kzm.ram", ram_size, &error_abort); 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(sram, NULL, "kzm.sram", 0x4000, &error_abort); memory_region_add_subregion(address_space_mem, 0x1FFFC000, sram); dev = sysbus_create_varargs("imx_avic", 0x68000000, |
