diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-13 13:56:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-13 13:56:35 +0100 |
| commit | fa9701240951093907076db0943f96972a396ef5 (patch) | |
| tree | f24ce2ffe6c7ac316e8e316d48f8bf77ff491c5f /hw/display/virtio-vga.c | |
| parent | e1c270c9404efe47c94b944818fdd093e418f938 (diff) | |
| parent | c2843e93907a4084e91573994486e810cec248a0 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160913-1' into staging
virtio-gpu and vmsvga fixes.
# gpg: Signature made Tue 13 Sep 2016 09:14:44 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-vga-20160913-1:
virtio-vga: adapt to page-per-vq=off
virtio-gpu-pci: tag as not hotpluggable
vmsvga: correct bitmap and pixmap size checks
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/virtio-vga.c')
| -rw-r--r-- | hw/display/virtio-vga.c | 11 |
1 files changed, 11 insertions, 0 deletions
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; |