system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-14 15:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

vhost: bugfix

Browse source 
This fixes a regression in vhost.
 
 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJa1MuLAAoJECgfDbjSjVRpYzoH/RqprLADb2Q8jofq46/jw9gn
 +N+mIBDlZL2clobEpTG9QaSzwZr/dnXPa2R9pPSNONaeK3Qvqq7l+KXO2TGS3g6+
 XUckTurNBsjoFZ4Lfgrn9jHm1ZH6YO/vsUuwW4nsx+yQZsm2EryiWK8QiAuXKkDT
 L1wJmkUbZFJ/u7GJorSHA3C9AirvvrTYUXGCw/J8nXZBqblKRB7lELmkk3hT0jjk
 lebzr6v2eORjz+2D6s6SqTFCVNA1nUZourbkiy64GlAj3sctSWfBLO/2DoiZDdEv
 PQhiW1EaWeb2+vl6Eot7nRwYmPZztUbh1rqsk/I9fi8uBvyZaYLKAlIEoRNDf3Y=
 =xj3W
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-04-17 09:57:52 +01:00
parent 9cb4e398c2 aebbdbee55
commit 32f418c003
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/virtio/vhost.c
View file

@ -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;