[libvirt] [PATCH v2 4/4] hw/display: Remove "rombar" hack from vga-pci and vmware_vga

[Philippe Mathieu-Daudé]

On 12/9/19 1:52 PM, Thomas Huth wrote:
> 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 at redhat.com>
> ---
>   hw/display/vga-pci.c    | 5 -----
>   hw/display/vga.c        | 4 +---
>   hw/display/vmware_vga.c | 5 -----
>   3 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
> index a27b88122d..cfe095713e 100644
> --- a/hw/display/vga-pci.c
> +++ b/hw/display/vga-pci.c
> @@ -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)
> diff --git a/hw/display/vga.c b/hw/display/vga.c
> index 82ebe53610..636586a476 100644
> --- a/hw/display/vga.c
> +++ b/hw/display/vga.c
> @@ -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 */

If I understand the comment correctly, we can now revert commit 
8294a64d7f9 and and remove the alias, isn't it?

>       memory_region_init_alias(&s->vram_vbe, obj, "vram.vbe",
>                                &s->vram, 0, memory_region_size(&s->vram));
>       /* XXX: use optimized standard vga accesses */
> diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
> index 23dc8910cc..ead754eccf 100644
> --- a/hw/display/vmware_vga.c
> +++ b/hw/display/vmware_vga.c
> @@ -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[] = {
>