summaryrefslogtreecommitdiffstats
path: root/hw/display/vga.c
diff options
context:
space:
mode:
authorHu Tao2014-09-09 07:27:55 +0200
committerPaolo Bonzini2014-09-09 13:41:43 +0200
commit49946538d29618319a54e798f22bbcc8065ad106 (patch)
tree0f01a93a81f7091378782956bd17342912731be7 /hw/display/vga.c
parentexec: add parameter errp to qemu_ram_alloc and qemu_ram_alloc_from_ptr (diff)
downloadqemu-49946538d29618319a54e798f22bbcc8065ad106.tar.gz
qemu-49946538d29618319a54e798f22bbcc8065ad106.tar.xz
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/display/vga.c')
-rw-r--r--hw/display/vga.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 62e6243c6f..d5f5a013c7 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2326,7 +2326,8 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate)
}
s->is_vbe_vmstate = 1;
- memory_region_init_ram(&s->vram, obj, "vga.vram", s->vram_size);
+ memory_region_init_ram(&s->vram, obj, "vga.vram", s->vram_size,
+ &error_abort);
vmstate_register_ram(&s->vram, global_vmstate ? NULL : DEVICE(obj));
xen_register_framebuffer(&s->vram);
s->vram_ptr = memory_region_get_ram_ptr(&s->vram);