Skip to content

Commit

Permalink
Revert "virtio-net: enable virtio 1.0"
Browse files Browse the repository at this point in the history
This reverts commit df91055.

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>
  • Loading branch information
jasowang authored and mstsirkin committed Jul 13, 2015
1 parent 2a63912 commit 06c4670
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion hw/net/virtio-net.c
Expand Up @@ -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);
Expand Down

0 comments on commit 06c4670

Please sign in to comment.