diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2013-10-11 19:56:59 +0200 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-04-28 10:21:55 +0200 |
commit | e2bbfc8ee2aa82519da7de281305c3bea5431cf1 (patch) | |
tree | eff43085ec85a0b45228134ce0d6dd90be36bf35 /hw/display/vga.c | |
parent | 411f491e0af173cf8f39347574941bd26fbae381 (diff) | |
download | qemu-e2bbfc8ee2aa82519da7de281305c3bea5431cf1.zip qemu-e2bbfc8ee2aa82519da7de281305c3bea5431cf1.tar.gz qemu-e2bbfc8ee2aa82519da7de281305c3bea5431cf1.tar.bz2 |
vga: allow non-global vmstate
Need a way to opt-out from vga.vram being global vmstate, for
secondary vga cards. Add a bool parameter to vga_common_init
to support this.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/display/vga.c')
-rw-r--r-- | hw/display/vga.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index 063319d..8891e0a 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2252,7 +2252,7 @@ static const GraphicHwOps vga_ops = { .text_update = vga_update_text, }; -void vga_common_init(VGACommonState *s, Object *obj) +void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) { int i, j, v, b; @@ -2289,7 +2289,7 @@ void vga_common_init(VGACommonState *s, Object *obj) s->is_vbe_vmstate = 1; memory_region_init_ram(&s->vram, obj, "vga.vram", s->vram_size); - vmstate_register_ram_global(&s->vram); + 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); s->get_bpp = vga_get_bpp; |