From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEcTY-0007rd-JS for qemu-devel@nongnu.org; Mon, 13 Jul 2015 08:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEcTU-00061V-Ma for qemu-devel@nongnu.org; Mon, 13 Jul 2015 08:04:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEcTU-00061M-GQ for qemu-devel@nongnu.org; Mon, 13 Jul 2015 08:04:44 -0400 Date: Mon, 13 Jul 2015 15:04:41 +0300 From: "Michael S. Tsirkin" Message-ID: <1436789051-18446-4-git-send-email-mst@redhat.com> References: <1436789051-18446-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1436789051-18446-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 3/4] Revert "virtio-net: enable virtio 1.0" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , Peter Maydell , Jason Wang From: Jason Wang 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 Signed-off-by: Jason Wang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index d728233..e3c2db3 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); -- MST