[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/13] vhost-net: revert support of cross-endian vnet
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 02/13] vhost-net: revert support of cross-endian vnet headers |
Date: |
Fri, 19 Feb 2016 10:00:11 +0200 |
From: Greg Kurz <address@hidden>
Cross-endian is now handled by the core virtio-net code.
This patch reverts:
commit 5be7d9f1b1452613b95c6ba70b8d7ad3d0797991
vhost-net: tell tap backend about the vnet endianness
and
commit cf0a628f6e81bfc9b7a944fa0b80c3594836df56
net: set endianness on all backend devices
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>
---
hw/net/vhost_net.c | 41 +++++------------------------------------
1 file changed, 5 insertions(+), 36 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 3940a04..b242832 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -36,7 +36,6 @@
#include "standard-headers/linux/virtio_ring.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/virtio-bus.h"
-#include "hw/virtio/virtio-access.h"
struct vhost_net {
struct vhost_dev dev;
@@ -197,27 +196,6 @@ static void vhost_net_set_vq_index(struct vhost_net *net,
int vq_index)
net->dev.vq_index = vq_index;
}
-static int vhost_net_set_vnet_endian(VirtIODevice *dev, NetClientState *peer,
- bool set)
-{
- int r = 0;
-
- if (virtio_vdev_has_feature(dev, VIRTIO_F_VERSION_1) ||
- (virtio_legacy_is_cross_endian(dev) && !virtio_is_big_endian(dev))) {
- r = qemu_set_vnet_le(peer, set);
- if (r) {
- error_report("backend does not support LE vnet headers");
- }
- } else if (virtio_legacy_is_cross_endian(dev)) {
- r = qemu_set_vnet_be(peer, set);
- if (r) {
- error_report("backend does not support BE vnet headers");
- }
- }
-
- return r;
-}
-
static int vhost_net_start_one(struct vhost_net *net,
VirtIODevice *dev)
{
@@ -298,25 +276,21 @@ int vhost_net_start(VirtIODevice *dev, NetClientState
*ncs,
BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev)));
VirtioBusState *vbus = VIRTIO_BUS(qbus);
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus);
- int r, e, i, j;
+ int r, e, i;
if (!k->set_guest_notifiers) {
error_report("binding does not support guest notifiers");
return -ENOSYS;
}
- for (j = 0; j < total_queues; j++) {
- r = vhost_net_set_vnet_endian(dev, ncs[j].peer, true);
- if (r < 0) {
- goto err_endian;
- }
- vhost_net_set_vq_index(get_vhost_net(ncs[j].peer), j * 2);
+ for (i = 0; i < total_queues; i++) {
+ vhost_net_set_vq_index(get_vhost_net(ncs[i].peer), i * 2);
}
r = k->set_guest_notifiers(qbus->parent, total_queues * 2, true);
if (r < 0) {
error_report("Error binding guest notifier: %d", -r);
- goto err_endian;
+ goto err;
}
for (i = 0; i < total_queues; i++) {
@@ -338,10 +312,7 @@ err_start:
fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e);
fflush(stderr);
}
-err_endian:
- while (--j >= 0) {
- vhost_net_set_vnet_endian(dev, ncs[j].peer, false);
- }
+err:
return r;
}
@@ -363,8 +334,6 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
fflush(stderr);
}
assert(r >= 0);
-
- assert(vhost_net_set_vnet_endian(dev, ncs[0].peer, false) >= 0);
}
void vhost_net_cleanup(struct vhost_net *net)
--
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 <=
- [Qemu-devel] [PULL 03/13] virtio: move cross-endian helper to vhost, Michael S. Tsirkin, 2016/02/19
- [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