[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] virtio: Fail if iommu_platform is requested, but unsuppor
From: |
Kevin Wolf |
Subject: |
[PATCH v2 5/6] virtio: Fail if iommu_platform is requested, but unsupported |
Date: |
Thu, 29 Apr 2021 19:13:15 +0200 |
Commit 2943b53f6 (' virtio: force VIRTIO_F_IOMMU_PLATFORM') made sure
that vhost can't just reject VIRTIO_F_IOMMU_PLATFORM when it was
requested. However, just adding it back to the negotiated flags isn't
right either because it promises support to the guest that the device
actually doesn't support. One example of a vhost-user device that
doesn't have support for the flag is the vhost-user-blk export of QEMU.
Instead of successfully creating a device that doesn't work, just fail
to plug the device when it doesn't support the feature, but it was
requested. This results in much clearer error messages.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1935019
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
---
hw/virtio/virtio-bus.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index d6332d45c3..859978d248 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -69,6 +69,11 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error
**errp)
return;
}
+ if (has_iommu && !virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
+ error_setg(errp, "iommu_platform=true is not supported by the device");
+ return;
+ }
+
if (klass->device_plugged != NULL) {
klass->device_plugged(qbus->parent, &local_err);
}
--
2.30.2
- [PATCH v2 0/6] vhost-user-blk: Error handling fixes during initialistion, Kevin Wolf, 2021/04/29
- [PATCH v2 2/6] vhost-user-blk: Don't reconnect during initialisation, Kevin Wolf, 2021/04/29
- [PATCH v2 3/6] vhost-user-blk: Improve error reporting in realize, Kevin Wolf, 2021/04/29
- [PATCH v2 1/6] vhost-user-blk: Make sure to set Error on realize failure, Kevin Wolf, 2021/04/29
- [PATCH v2 4/6] vhost-user-blk: Get more feature flags from vhost device, Kevin Wolf, 2021/04/29
- [PATCH v2 5/6] virtio: Fail if iommu_platform is requested, but unsupported,
Kevin Wolf <=
- [PATCH v2 6/6] vhost-user-blk: Check that num-queues is supported by backend, Kevin Wolf, 2021/04/29