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/tricore/tricore_testboard.c | |
| parent | ef701d7b6f9e33cef11c823b140a0f93e150b27b (diff) | |
| download | focaccia-qemu-49946538d29618319a54e798f22bbcc8065ad106.tar.gz focaccia-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 'hw/tricore/tricore_testboard.c')
| -rw-r--r-- | hw/tricore/tricore_testboard.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index f412e27f1c..605de86302 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -76,17 +76,17 @@ static void tricore_testboard_init(MachineState *machine, int board_id) error_report("Unable to find CPU definition"); exit(1); } - memory_region_init_ram(ext_cram, NULL, "powerlink_ext_c.ram", 2*1024*1024); + memory_region_init_ram(ext_cram, NULL, "powerlink_ext_c.ram", 2*1024*1024, &error_abort); vmstate_register_ram_global(ext_cram); - memory_region_init_ram(ext_dram, NULL, "powerlink_ext_d.ram", 4*1024*1024); + memory_region_init_ram(ext_dram, NULL, "powerlink_ext_d.ram", 4*1024*1024, &error_abort); vmstate_register_ram_global(ext_dram); - memory_region_init_ram(int_cram, NULL, "powerlink_int_c.ram", 48*1024); + memory_region_init_ram(int_cram, NULL, "powerlink_int_c.ram", 48*1024, &error_abort); vmstate_register_ram_global(int_cram); - memory_region_init_ram(int_dram, NULL, "powerlink_int_d.ram", 48*1024); + memory_region_init_ram(int_dram, NULL, "powerlink_int_d.ram", 48*1024, &error_abort); vmstate_register_ram_global(int_dram); - memory_region_init_ram(pcp_data, NULL, "powerlink_pcp_data.ram", 16*1024); + memory_region_init_ram(pcp_data, NULL, "powerlink_pcp_data.ram", 16*1024, &error_abort); vmstate_register_ram_global(pcp_data); - memory_region_init_ram(pcp_text, NULL, "powerlink_pcp_text.ram", 32*1024); + memory_region_init_ram(pcp_text, NULL, "powerlink_pcp_text.ram", 32*1024, &error_abort); vmstate_register_ram_global(pcp_text); memory_region_add_subregion(sysmem, 0x80000000, ext_cram); |