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/display/virtio-gpu.c | |
| parent | f74425e267f81f0f94adf47ecbd66224e0461936 (diff) | |
| parent | 34e304e97576a9e17680c868c00ff524a981007b (diff) | |
| download | focaccia-qemu-fb2516ef94b8399ddded4a41c4346cbc1d5d98fc.tar.gz focaccia-qemu-fb2516ef94b8399ddded4a41c4346cbc1d5d98fc.zip | |
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/display/virtio-gpu.c')
| -rw-r--r-- | hw/display/virtio-gpu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 274e365713..6658f6c6a6 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; |