|
 |
8be556 |
From 89db7a99ad2a13c705c0a377c0176c555aad8d4a Mon Sep 17 00:00:00 2001
|
|
|
8be556 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
8be556 |
Date: Fri, 3 Jul 2015 19:13:39 +0200
|
|
|
8be556 |
Subject: [PATCH 115/217] vhost_net: re-enable when cross endian
|
|
|
8be556 |
MIME-Version: 1.0
|
|
|
8be556 |
Content-Type: text/plain; charset=UTF-8
|
|
|
8be556 |
Content-Transfer-Encoding: 8bit
|
|
|
8be556 |
|
|
|
8be556 |
Message-id: <1435950819-10991-8-git-send-email-thuth@redhat.com>
|
|
|
8be556 |
Patchwork-id: 66700
|
|
|
8be556 |
O-Subject: [RHEL7.2 qemu-kvm-rhev PATCH 7/7] vhost_net: re-enable when cross endian
|
|
|
8be556 |
Bugzilla: 1225715
|
|
|
8be556 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
8be556 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
8be556 |
|
|
|
8be556 |
From: Cédric Le Goater <clg@fr.ibm.com>
|
|
|
8be556 |
|
|
|
8be556 |
Cross-endianness is now checked by the core vhost code.
|
|
|
8be556 |
|
|
|
8be556 |
revert 371df9f5e0f1 "vhost-net: disable when cross-endian"
|
|
|
8be556 |
|
|
|
8be556 |
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
|
|
|
8be556 |
[ added commit message, Greg Kurz <gkurz@linux.vnet.ibm.com> ]
|
|
|
8be556 |
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
|
|
|
8be556 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
(cherry picked from commit 1717388645670336c48aa05d19b0acd07687a821)
|
|
|
8be556 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
8be556 |
|
|
|
8be556 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
---
|
|
|
8be556 |
hw/net/vhost_net.c | 19 -------------------
|
|
|
8be556 |
1 file changed, 19 deletions(-)
|
|
|
8be556 |
|
|
|
8be556 |
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
|
|
|
8be556 |
index 1884e59..3e4b0f2 100644
|
|
|
8be556 |
--- a/hw/net/vhost_net.c
|
|
|
8be556 |
+++ b/hw/net/vhost_net.c
|
|
|
8be556 |
@@ -293,19 +293,6 @@ static void vhost_net_stop_one(struct vhost_net *net,
|
|
|
8be556 |
vhost_dev_disable_notifiers(&net->dev, dev);
|
|
|
8be556 |
}
|
|
|
8be556 |
|
|
|
8be556 |
-static bool vhost_net_device_endian_ok(VirtIODevice *vdev)
|
|
|
8be556 |
-{
|
|
|
8be556 |
-#ifdef TARGET_IS_BIENDIAN
|
|
|
8be556 |
-#ifdef HOST_WORDS_BIGENDIAN
|
|
|
8be556 |
- return virtio_is_big_endian(vdev);
|
|
|
8be556 |
-#else
|
|
|
8be556 |
- return !virtio_is_big_endian(vdev);
|
|
|
8be556 |
-#endif
|
|
|
8be556 |
-#else
|
|
|
8be556 |
- return true;
|
|
|
8be556 |
-#endif
|
|
|
8be556 |
-}
|
|
|
8be556 |
-
|
|
|
8be556 |
int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
|
|
|
8be556 |
int total_queues)
|
|
|
8be556 |
{
|
|
|
8be556 |
@@ -314,12 +301,6 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
|
|
|
8be556 |
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus);
|
|
|
8be556 |
int r, e, i;
|
|
|
8be556 |
|
|
|
8be556 |
- if (!vhost_net_device_endian_ok(dev)) {
|
|
|
8be556 |
- error_report("vhost-net does not support cross-endian");
|
|
|
8be556 |
- r = -ENOSYS;
|
|
|
8be556 |
- goto err;
|
|
|
8be556 |
- }
|
|
|
8be556 |
-
|
|
|
8be556 |
if (!k->set_guest_notifiers) {
|
|
|
8be556 |
error_report("binding does not support guest notifiers");
|
|
|
8be556 |
r = -ENOSYS;
|
|
|
8be556 |
--
|
|
|
8be556 |
1.8.3.1
|
|
|
8be556 |
|