diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 17:24:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 17:24:00 +0000 |
| commit | fb2516ef94b8399ddded4a41c4346cbc1d5d98fc (patch) | |
| tree | dd92ea15191cc6cfffbd491319f9ea0c03b652ad /hw | |
| parent | f74425e267f81f0f94adf47ecbd66224e0461936 (diff) | |
| parent | 34e304e97576a9e17680c868c00ff524a981007b (diff) | |
| download | qemu-fb2516ef94b8399ddded4a41c4346cbc1d5d98fc.zip qemu-fb2516ef94b8399ddded4a41c4346cbc1d5d98fc.tar.gz qemu-fb2516ef94b8399ddded4a41c4346cbc1d5d98fc.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180202-pull-request' into staging
virtio-gpu: disallow vIOMMU
# gpg: Signature made Fri 02 Feb 2018 08:31:52 GMT
# 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-20180202-pull-request:
virtio-gpu: disallow vIOMMU
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/virtio-gpu-pci.c | 8 | ||||
| -rw-r--r-- | hw/display/virtio-gpu.c | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index ef92c4a..3519dc8 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -28,10 +28,16 @@ static void virtio_gpu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) VirtIOGPU *g = &vgpu->vdev; DeviceState *vdev = DEVICE(&vgpu->vdev); int i; + Error *local_error = NULL; qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); virtio_pci_force_virtio_1(vpci_dev); - object_property_set_bool(OBJECT(vdev), true, "realized", errp); + object_property_set_bool(OBJECT(vdev), true, "realized", &local_error); + + if (local_error) { + error_propagate(errp, local_error); + return; + } for (i = 0; i < g->conf.max_outputs; i++) { object_property_set_link(OBJECT(g->scanout[i].con), diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 274e365..6658f6c 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1173,6 +1173,11 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) Error *local_err = NULL; int i; + if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) { + error_setg(errp, "virtio-gpu does not support vIOMMU yet"); + return; + } + if (g->conf.max_outputs > VIRTIO_GPU_MAX_SCANOUTS) { error_setg(errp, "invalid max_outputs > %d", VIRTIO_GPU_MAX_SCANOUTS); return; |