diff options
| author | Paolo Bonzini | 2013-06-07 03:21:13 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2013-07-04 17:42:46 +0200 |
| commit | 831183277318395ecd02f2fe2423f5fe983ed96a (patch) | |
| tree | ee16f7260421976f0f4452c5cd9d541b301fdc79 /hw/display/vga.c | |
| parent | vga: pass owner to cirrus_init_common (diff) | |
| download | qemu-831183277318395ecd02f2fe2423f5fe983ed96a.tar.gz qemu-831183277318395ecd02f2fe2423f5fe983ed96a.tar.xz qemu-831183277318395ecd02f2fe2423f5fe983ed96a.zip | |
vga: pass owner to vga_init_vbe
Signed-off-by: Paolo Bonzini <pbonzini@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 d3e0f33066..ce3ca7ea9c 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2380,12 +2380,12 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space, } } -void vga_init_vbe(VGACommonState *s, MemoryRegion *system_memory) +void vga_init_vbe(VGACommonState *s, Object *obj, MemoryRegion *system_memory) { /* With pc-0.12 and below we map both the PCI BAR and the fixed VBE region, * so use an alias to avoid double-mapping the same region. */ - memory_region_init_alias(&s->vram_vbe, NULL, "vram.vbe", + memory_region_init_alias(&s->vram_vbe, obj, "vram.vbe", &s->vram, 0, memory_region_size(&s->vram)); /* XXX: use optimized standard vga accesses */ memory_region_add_subregion(system_memory, |