openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vhost: move virtio 1.0 check to cross-endian helper 

Indeed vhost doesn't need to ask for vring endian fixing if the device is
virtio 1.0, since it is already handled by the in-kernel vhost driver. This
patch simply consolidates the logic into the existing helper.

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
This commit is contained in:
Greg Kurz 2016-02-05 11:45:49 +01:00 committed by Michael S. Tsirkin
parent a122ab2472
commit e58481234e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/virtio/vhost.c
View File

@ -751,6 +751,9 @@ static void vhost_log_stop(MemoryListener *listener,
static inline bool vhost_needs_vring_endian(VirtIODevice *vdev) static inline bool vhost_needs_vring_endian(VirtIODevice *vdev)
{ {
if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
return false;
}
#ifdef TARGET_IS_BIENDIAN #ifdef TARGET_IS_BIENDIAN
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
return !virtio_is_big_endian(vdev); return !virtio_is_big_endian(vdev);
@ -812,8 +815,7 @@ static int vhost_virtqueue_start(struct vhost_dev *dev,
return -errno; return -errno;
} }
if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && if (vhost_needs_vring_endian(vdev)) {
vhost_needs_vring_endian(vdev)) {
r = vhost_virtqueue_set_vring_endian_legacy(dev, r = vhost_virtqueue_set_vring_endian_legacy(dev,
virtio_is_big_endian(vdev), virtio_is_big_endian(vdev),
vhost_vq_index); vhost_vq_index);
@ -909,8 +911,7 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev,
/* In the cross-endian case, we need to reset the vring endianness to /* In the cross-endian case, we need to reset the vring endianness to
* native as legacy devices expect so by default. * native as legacy devices expect so by default.
*/ */
if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && if (vhost_needs_vring_endian(vdev)) {
vhost_needs_vring_endian(vdev)) {
r = vhost_virtqueue_set_vring_endian_legacy(dev, r = vhost_virtqueue_set_vring_endian_legacy(dev,
!virtio_is_big_endian(vdev), !virtio_is_big_endian(vdev),
vhost_vq_index); vhost_vq_index);