diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-26 17:37:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-26 17:37:56 +0100 |
| commit | 7e2d08863b5cd4d35e6e0dc211b0cceaa350ade2 (patch) | |
| tree | de59ed166203b8e8e341436cdf601fcbe5b4b9a4 /hw/display/virtio-vga.c | |
| parent | 0ab4c574a55448a37b9f616259b82950742c9427 (diff) | |
| parent | fd1cfb875be551064a27d909edb406316f011f2c (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180626-pull-request' into staging
vga: bugfix collection.
# gpg: Signature made Tue 26 Jun 2018 17:27:23 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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/vga-20180626-pull-request:
virtio-gpu-3d: Drop workaround for VIRTIO_GPU_CAPSET_VIRGL2 define
ramfb: fix overflow
vga: set owner for mmio regions
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index baa74ba82c..97db6c3372 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -152,7 +152,7 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) } /* add stdvga mmio regions */ - pci_std_vga_mmio_region_init(vga, &vpci_dev->modern_bar, + pci_std_vga_mmio_region_init(vga, OBJECT(vvga), &vpci_dev->modern_bar, vvga->vga_mrs, true); vga->con = g->scanout[0].con; |