Commit fb2516ef authored Feb 02, 2018 by Peter Maydell

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>

parents f74425e2 34e304e9

hw/display/virtio-gpu-pci.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -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),

hw/display/virtio-gpu.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;