diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-17 09:57:52 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-17 09:57:52 +0100 |
| commit | 32f418c0031ff6319a7c9f666e420566e95c70ae (patch) | |
| tree | 3cdae6175126420f471de44e94505950678d3ae8 | |
| parent | 9cb4e398c2f95c1e837fe9c570e124a55259f725 (diff) | |
| parent | aebbdbee559389a9f0d0e56670b9332534b6bb9b (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
vhost: bugfix
This fixes a regression in vhost.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 16 Apr 2018 17:12:59 BST
# gpg: using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
vhost: do not verify ring mappings when IOMMU is enabled
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/virtio/vhost.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index f51bf573d5..9d5850a7d7 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -342,6 +342,10 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev, "used ring" }; + if (vhost_dev_has_iommu(dev)) { + return 0; + } + for (i = 0; i < dev->nvqs; ++i) { struct vhost_virtqueue *vq = dev->vqs + i; |