]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
Revert "virtio-net: enable virtio 1.0"
authorJason Wang <jasowang@redhat.com>
Mon, 13 Jul 2015 05:46:50 +0000 (13:46 +0800)
committerMichael S. Tsirkin <mst@redhat.com>
Mon, 13 Jul 2015 11:42:24 +0000 (14:42 +0300)
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>
hw/net/virtio-net.c

index d7282335de8b7714ed5100ad7794ad4ed6a44465..e3c2db32505b8a0be1643afea174a9609f96ba6a 100644 (file)
@@ -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);