[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/13] virtio: move cross-endian helper to vhost
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 03/13] virtio: move cross-endian helper to vhost |
Date: |
Fri, 19 Feb 2016 10:00:14 +0200 |
From: Greg Kurz <address@hidden>
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.
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
include/hw/virtio/virtio-access.h | 13 -------------
hw/virtio/vhost.c | 17 +++++++++++++++--
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/hw/virtio/virtio-access.h
b/include/hw/virtio/virtio-access.h
index a01fff2..f1f12af 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)) {
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 7dff755..6fea07c 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -749,6 +749,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)
@@ -800,7 +813,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);
@@ -897,7 +910,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);
--
MST
- [Qemu-devel] [PULL 00/13] vhost, virtio, pci, pxe, Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 01/13] virtio-net: use the backend cross-endian capabilities, Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 02/13] vhost-net: revert support of cross-endian vnet headers, Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 03/13] virtio: move cross-endian helper to vhost,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 05/13] vhost: simplify vhost_needs_vring_endian(), Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 04/13] vhost: move virtio 1.0 check to cross-endian helper, Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 06/13] virtio: optimize virtio_access_is_big_endian() for little-endian targets, Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 07/13] msix: fix msix_vector_masked, Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 08/13] tests: add pxe e1000 and virtio-pci tests, Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 09/13] dec: convert to realize(), Michael S. Tsirkin, 2016/02/19
- [Qemu-devel] [PULL 10/13] change type of pci_bridge_initfn() to void, Michael S. Tsirkin, 2016/02/19