From patchwork Mon Jul 13 05:46:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 494231 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E6FE71402B4 for ; Mon, 13 Jul 2015 15:48:57 +1000 (AEST) Received: from localhost ([::1]:53003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEWbo-0001SC-6R for incoming@patchwork.ozlabs.org; Mon, 13 Jul 2015 01:48:56 -0400 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 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id BECE4AED46; Mon, 13 Jul 2015 05:47:02 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (vpn1-4-152.pek2.redhat.com [10.72.4.152]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6D5kqAW025330; Mon, 13 Jul 2015 01:47:01 -0400 From: Jason Wang To: qemu-devel@nongnu.org, mst@redhat.com 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Cornelia Huck , Jason Wang Subject: [Qemu-devel] [PATCH 4/5] Revert "virtio-net: enable virtio 1.0" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);