diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-09 14:30:08 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-18 02:34:13 +0100 |
commit | e2328a11bda7a4d087200c524333adafb8beb7d7 (patch) | |
tree | 1a671e664c6c9f6cdc5aa0fa27b24fe2e76585f3 /hw/display/vga.c | |
parent | 97d8381543647887bc2997ecfeccc67831e47fdc (diff) | |
download | qemu-e2328a11bda7a4d087200c524333adafb8beb7d7.zip qemu-e2328a11bda7a4d087200c524333adafb8beb7d7.tar.gz qemu-e2328a11bda7a4d087200c524333adafb8beb7d7.tar.bz2 |
vga: cleanup mapping of VRAM for non-PCI VGA
vga_init_vbe is now used only from ISA VGA cards. Since the alias is
not needed anymore, remove it (effectively reverting commit 8294a64d7f,
"vga: fix vram double-mapping with -vga std and -M pc-0.12", 2012-05-29)
and the now unused vbe_mapped field of VGACommonState. The function now
consists of a single memory_region_add_subregion call, so we can inline
it; this avoids incorrect usage from PCI cards.
Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Based-on: <05af415a-5058-98b4-4a12-9d093a30b1e3@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/display/vga.c')
-rw-r--r-- | hw/display/vga.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index 636586a..061fd9a 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2301,15 +2301,3 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space, portio_list_add(&s->vbe_port_list, address_space_io, 0x1ce); } } - -void vga_init_vbe(VGACommonState *s, Object *obj, MemoryRegion *system_memory) -{ - /* Use an alias to avoid double-mapping the same region */ - 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, - VBE_DISPI_LFB_PHYSICAL_ADDRESS, - &s->vram_vbe); - s->vbe_mapped = 1; -} |