mirror of https://github.com/xemu-project/xemu.git
hw/display: Remove "rombar" hack from vga-pci and vmware_vga
Now that the old pc-0.x machine types have been removed, we do not need the old "rombar" hacks anymore. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20191209125248.5849-5-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
2a4dbaf1c0
commit
97d8381543
|
@ -264,11 +264,6 @@ static void pci_std_vga_realize(PCIDevice *dev, Error **errp)
|
|||
|
||||
pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);
|
||||
}
|
||||
|
||||
if (!dev->rom_bar) {
|
||||
/* compatibility with pc-0.13 and older */
|
||||
vga_init_vbe(s, OBJECT(dev), pci_address_space(dev));
|
||||
}
|
||||
}
|
||||
|
||||
static void pci_std_vga_init(Object *obj)
|
||||
|
|
|
@ -2304,9 +2304,7 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
|
|||
|
||||
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.
|
||||
*/
|
||||
/* 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 */
|
||||
|
|
|
@ -1312,11 +1312,6 @@ static void pci_vmsvga_realize(PCIDevice *dev, Error **errp)
|
|||
&s->chip.vga.vram);
|
||||
pci_register_bar(dev, 2, PCI_BASE_ADDRESS_MEM_PREFETCH,
|
||||
&s->chip.fifo_ram);
|
||||
|
||||
if (!dev->rom_bar) {
|
||||
/* compatibility with pc-0.13 and older */
|
||||
vga_init_vbe(&s->chip.vga, OBJECT(dev), pci_address_space(dev));
|
||||
}
|
||||
}
|
||||
|
||||
static Property vga_vmware_properties[] = {
|
||||
|
|
Loading…
Reference in New Issue