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/omap2.c | |
parent | ef701d7b6f9e33cef11c823b140a0f93e150b27b (diff) | |
download | qemu-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 'hw/arm/omap2.c')
-rw-r--r-- | hw/arm/omap2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index dc53a7abba..d6e19ae6b2 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -2266,10 +2266,12 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, omap_clk_init(s); /* Memory-mapped stuff */ - memory_region_init_ram(&s->sdram, NULL, "omap2.dram", s->sdram_size); + memory_region_init_ram(&s->sdram, NULL, "omap2.dram", s->sdram_size, + &error_abort); vmstate_register_ram_global(&s->sdram); memory_region_add_subregion(sysmem, OMAP2_Q2_BASE, &s->sdram); - memory_region_init_ram(&s->sram, NULL, "omap2.sram", s->sram_size); + memory_region_init_ram(&s->sram, NULL, "omap2.sram", s->sram_size, + &error_abort); vmstate_register_ram_global(&s->sram); memory_region_add_subregion(sysmem, OMAP2_SRAM_BASE, &s->sram); |