From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEWa0-0006Mb-4y for qemu-devel@nongnu.org; Mon, 13 Jul 2015 01:47:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEWZz-0006Jk-BJ for qemu-devel@nongnu.org; Mon, 13 Jul 2015 01:47:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52760) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEWZz-0006Je-5M for qemu-devel@nongnu.org; Mon, 13 Jul 2015 01:47:03 -0400 From: Jason Wang Date: Mon, 13 Jul 2015 13:46:50 +0800 Message-Id: <1436766411-29144-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1436766411-29144-1-git-send-email-jasowang@redhat.com> References: <1436766411-29144-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH 4/5] Revert "virtio-net: enable virtio 1.0" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mst@redhat.com Cc: Cornelia Huck , 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 --- 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); -- 2.1.4