Commit 15138b5e authored by Anthoine Bourgeois's avatar Anthoine Bourgeois Committed by Michael S. Tsirkin
Browse files

virtio-vga: fix virtio-vga bar ordering 



With virtio-vga, pci bar are reordered. Bar #2 is used for compatibility
with stdvga. By default, bar #2 is used by virtio modern io bar.
This bar is the last one introduce in the virtio pci bar layout and it's
crushed by the virtio-vga reordering. So virtio-vga and
modern-pio-notify are incompatible because virtio-vga failed to
initialize with this option.

This fix sets the modern io bar to the bar #5 to avoid conflict.

Signed-off-by: default avatarAnthoine Bourgeois <anthoine.bourgeois@gmail.com>
Message-Id: <20200422215455.10244-1-anthoine.bourgeois@gmail.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent ba480fa6

hw/display/virtio-vga.c

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
     */

    vpci_dev->modern_mem_bar_idx = 2;

    vpci_dev->msix_bar_idx = 4;

    vpci_dev->modern_io_bar_idx = 5;



    if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) {

        /*