|
 |
8be556 |
From 692fca15761470e9ba250bd5f33a6b2c6015c7c0 Mon Sep 17 00:00:00 2001
|
|
|
8be556 |
From: Xiao Wang <jasowang@redhat.com>
|
|
|
8be556 |
Date: Tue, 7 Jul 2015 09:18:34 +0200
|
|
|
8be556 |
Subject: [PATCH 146/217] virtio-net: enable virtio 1.0
|
|
|
8be556 |
|
|
|
8be556 |
Message-id: <1436260751-25015-32-git-send-email-jasowang@redhat.com>
|
|
|
8be556 |
Patchwork-id: 66806
|
|
|
8be556 |
O-Subject: [RHEL7.2 qemu-kvm-rhev PATCH V2 31/68] virtio-net: enable virtio 1.0
|
|
|
8be556 |
Bugzilla: 1227343
|
|
|
8be556 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
8be556 |
|
|
|
8be556 |
From: Cornelia Huck <cornelia.huck@de.ibm.com>
|
|
|
8be556 |
|
|
|
8be556 |
virtio-net (non-vhost) now should have everything in place to support
|
|
|
8be556 |
virtio 1.0: let's enable the feature bit for it.
|
|
|
8be556 |
|
|
|
8be556 |
Note that VIRTIO_F_VERSION_1 is technically a transport feature; once
|
|
|
8be556 |
every device is ready for virtio 1.0, we can move setting this
|
|
|
8be556 |
feature bit out of the individual devices.
|
|
|
8be556 |
|
|
|
8be556 |
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
|
|
|
8be556 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
8be556 |
|
|
|
8be556 |
(cherry picked from commit df91055db5c9cee93d70ca8c08d72119a240b987)
|
|
|
8be556 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
---
|
|
|
8be556 |
hw/net/virtio-net.c | 1 +
|
|
|
8be556 |
1 file changed, 1 insertion(+)
|
|
|
8be556 |
|
|
|
8be556 |
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
|
8be556 |
index ea9e22e..ed47f39 100644
|
|
|
8be556 |
--- a/hw/net/virtio-net.c
|
|
|
8be556 |
+++ b/hw/net/virtio-net.c
|
|
|
8be556 |
@@ -476,6 +476,7 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features)
|
|
|
8be556 |
}
|
|
|
8be556 |
|
|
|
8be556 |
if (!get_vhost_net(nc->peer)) {
|
|
|
8be556 |
+ virtio_add_feature(&features, VIRTIO_F_VERSION_1);
|
|
|
8be556 |
return features;
|
|
|
8be556 |
}
|
|
|
8be556 |
return vhost_net_get_features(get_vhost_net(nc->peer), features);
|
|
|
8be556 |
--
|
|
|
8be556 |
1.8.3.1
|
|
|
8be556 |
|