From c2843e93907a4084e91573994486e810cec248a0 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 8 Sep 2016 09:16:52 +0200 Subject: virtio-vga: adapt to page-per-vq=off Signed-off-by: Gerd Hoffmann Message-id: 1473319012-27560-1-git-send-email-kraxel@redhat.com --- hw/display/virtio-vga.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'hw/display/virtio-vga.c') diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 5b510a17fd..f77b401264 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -122,6 +122,17 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) */ vpci_dev->modern_mem_bar = 2; vpci_dev->msix_bar = 4; + + if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) { + /* + * with page-per-vq=off there is no padding space we can use + * for the stdvga registers. Make the common and isr regions + * smaller then. + */ + vpci_dev->common.size /= 2; + vpci_dev->isr.size /= 2; + } + offset = memory_region_size(&vpci_dev->modern_bar); offset -= vpci_dev->notify.size; vpci_dev->notify.offset = offset; -- cgit v1.2.3