From: Jason Wang <jasowang@redhat.com>
Date: Mon, 13 Jul 2015 05:46:50 +0000 (+0800)
Subject: Revert "virtio-net: enable virtio 1.0"
X-Git-Tag: qemu-xen-4.7.0-rc1~173^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=06c4670ff6d4acdc5a24e3d25748ee4a489d5869;p=qemu-xen.git

Revert "virtio-net: enable virtio 1.0"

This reverts commit df91055db5c9cee93d70ca8c08d72119a240b987.

This is because:
- vhost support virtio 1.0 now
- transport code (e.g virtio-pci) set this feature when modern is
  enabled, setting this unconditionally will break disable-modern=on.

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index d7282335de..e3c2db3250 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -466,7 +466,6 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features)
     }
 
     if (!get_vhost_net(nc->peer)) {
-        virtio_add_feature(&features, VIRTIO_F_VERSION_1);
         return features;
     }
     return vhost_net_get_features(get_vhost_net(nc->peer), features);