From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRg5V-0001rE-NS for qemu-devel@nongnu.org; Fri, 05 Feb 2016 08:06:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRg5P-0007Pq-9Q for qemu-devel@nongnu.org; Fri, 05 Feb 2016 08:06:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRg5P-0007PU-3L for qemu-devel@nongnu.org; Fri, 05 Feb 2016 08:06:07 -0500 References: <20160205103927.21017.26364.stgit@bahia.huguette.org> <20160205104548.21017.80009.stgit@bahia.huguette.org> From: Laurent Vivier Message-ID: <56B49E39.1010104@redhat.com> Date: Fri, 5 Feb 2016 14:06:01 +0100 MIME-Version: 1.0 In-Reply-To: <20160205104548.21017.80009.stgit@bahia.huguette.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 4/6] vhost: move virtio 1.0 check to cross-endian helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz , "Michael S. Tsirkin" Cc: Cornelia Huck , qemu-devel@nongnu.org On 05/02/2016 11:45, Greg Kurz wrote: > 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 > Signed-off-by: Greg Kurz Reviewed-by: Laurent Vivier > --- > hw/virtio/vhost.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > index 6fea07c8ae15..bb17177f5e7e 100644 > --- a/hw/virtio/vhost.c > +++ b/hw/virtio/vhost.c > @@ -751,6 +751,9 @@ static void vhost_log_stop(MemoryListener *listener, > > 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 HOST_WORDS_BIGENDIAN > return !virtio_is_big_endian(vdev); > @@ -812,8 +815,7 @@ static int vhost_virtqueue_start(struct vhost_dev *dev, > return -errno; > } > > - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && > - vhost_needs_vring_endian(vdev)) { > + if (vhost_needs_vring_endian(vdev)) { > r = vhost_virtqueue_set_vring_endian_legacy(dev, > virtio_is_big_endian(vdev), > 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 > * native as legacy devices expect so by default. > */ > - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && > - vhost_needs_vring_endian(vdev)) { > + if (vhost_needs_vring_endian(vdev)) { > r = vhost_virtqueue_set_vring_endian_legacy(dev, > !virtio_is_big_endian(vdev), > vhost_vq_index); > >