Message ID | 20151109175816.4076.17152.stgit@bahia.huguette.org |
---|---|
State | New |
Headers | show |
On Mon, 09 Nov 2015 18:58:16 +0100 Greg Kurz <gkurz@linux.vnet.ibm.com> wrote: > If target is bi-endian (ppc64, arm), the virtio_legacy_is_cross_endian() > indeed returns the runtime state of the virtio device. However, it returns > false unconditionally in the general case. This sounds a bit strange > given the name of the function. > > This helper is only useful for vhost actually, where indeed non bi-endian > targets don't have to deal with cross-endian issues. > > This patch moves the helper to vhost.c and gives it a more appropriate name. > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > --- > hw/virtio/vhost.c | 17 +++++++++++++++-- > include/hw/virtio/virtio-access.h | 13 ------------- > 2 files changed, 15 insertions(+), 15 deletions(-) That's on top of your vnet header cleanup, right? With that in mind: Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
On Thu, 12 Nov 2015 19:00:54 +0100 Cornelia Huck <cornelia.huck@de.ibm.com> wrote: > On Mon, 09 Nov 2015 18:58:16 +0100 > Greg Kurz <gkurz@linux.vnet.ibm.com> wrote: > > > If target is bi-endian (ppc64, arm), the virtio_legacy_is_cross_endian() > > indeed returns the runtime state of the virtio device. However, it returns > > false unconditionally in the general case. This sounds a bit strange > > given the name of the function. > > > > This helper is only useful for vhost actually, where indeed non bi-endian > > targets don't have to deal with cross-endian issues. > > > > This patch moves the helper to vhost.c and gives it a more appropriate name. > > > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > > --- > > hw/virtio/vhost.c | 17 +++++++++++++++-- > > include/hw/virtio/virtio-access.h | 13 ------------- > > 2 files changed, 15 insertions(+), 15 deletions(-) > > That's on top of your vnet header cleanup, right? With that in mind: > Yes. > Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Thanks for your time ! -- Greg
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index de29968a7945..2e1e792d599e 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -748,6 +748,19 @@ static void vhost_log_stop(MemoryListener *listener, /* FIXME: implement */ } +static inline bool vhost_needs_vring_endian(VirtIODevice *vdev) +{ +#ifdef TARGET_IS_BIENDIAN +#ifdef HOST_WORDS_BIGENDIAN + return !virtio_is_big_endian(vdev); +#else + return virtio_is_big_endian(vdev); +#endif +#else + return false; +#endif +} + static int vhost_virtqueue_set_vring_endian_legacy(struct vhost_dev *dev, bool is_big_endian, int vhost_vq_index) @@ -799,7 +812,7 @@ static int vhost_virtqueue_start(struct vhost_dev *dev, } if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && - virtio_legacy_is_cross_endian(vdev)) { + vhost_needs_vring_endian(vdev)) { r = vhost_virtqueue_set_vring_endian_legacy(dev, virtio_is_big_endian(vdev), vhost_vq_index); @@ -896,7 +909,7 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev, * native as legacy devices expect so by default. */ if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && - virtio_legacy_is_cross_endian(vdev)) { + vhost_needs_vring_endian(vdev)) { r = vhost_virtqueue_set_vring_endian_legacy(dev, !virtio_is_big_endian(vdev), vhost_vq_index); diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h index 8aec843c8ff3..ba1530619939 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -32,19 +32,6 @@ static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) #endif } -static inline bool virtio_legacy_is_cross_endian(VirtIODevice *vdev) -{ -#ifdef TARGET_IS_BIENDIAN -#ifdef HOST_WORDS_BIGENDIAN - return !virtio_is_big_endian(vdev); -#else - return virtio_is_big_endian(vdev); -#endif -#else - return false; -#endif -} - static inline uint16_t virtio_lduw_phys(VirtIODevice *vdev, hwaddr pa) { if (virtio_access_is_big_endian(vdev)) {
If target is bi-endian (ppc64, arm), the virtio_legacy_is_cross_endian() indeed returns the runtime state of the virtio device. However, it returns false unconditionally in the general case. This sounds a bit strange given the name of the function. This helper is only useful for vhost actually, where indeed non bi-endian targets don't have to deal with cross-endian issues. This patch moves the helper to vhost.c and gives it a more appropriate name. Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- hw/virtio/vhost.c | 17 +++++++++++++++-- include/hw/virtio/virtio-access.h | 13 ------------- 2 files changed, 15 insertions(+), 15 deletions(-)