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-isa.c | |
| parent | 97d8381543647887bc2997ecfeccc67831e47fdc (diff) | |
| download | focaccia-qemu-e2328a11bda7a4d087200c524333adafb8beb7d7.tar.gz focaccia-qemu-e2328a11bda7a4d087200c524333adafb8beb7d7.zip | |
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-isa.c')
| -rw-r--r-- | hw/display/vga-isa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 873e5e9706..08a2730db5 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -76,7 +76,9 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) memory_region_set_coalescing(vga_io_memory); s->con = graphic_console_init(DEVICE(dev), 0, s->hw_ops, s); - vga_init_vbe(s, OBJECT(dev), isa_address_space(isadev)); + memory_region_add_subregion(isa_address_space(isadev), + VBE_DISPI_LFB_PHYSICAL_ADDRESS, + &s->vram); /* ROM BIOS */ rom_add_vga(VGABIOS_FILENAME); } |