From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz1Bz-0001AF-D8 for qemu-devel@nongnu.org; Wed, 18 Nov 2015 06:46:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz1Bw-0006YC-7I for qemu-devel@nongnu.org; Wed, 18 Nov 2015 06:46:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz1Bw-0006Y7-1s for qemu-devel@nongnu.org; Wed, 18 Nov 2015 06:46:24 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 51B6E3B759 for ; Wed, 18 Nov 2015 11:46:23 +0000 (UTC) Date: Wed, 18 Nov 2015 13:46:20 +0200 From: "Michael S. Tsirkin" Message-ID: <1447847112-1393-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH v2] vhost-user: ignore qemu-only features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Victor Kaplansky , Jason Wang Some feratures (such as ctrl vq) are supported by qemu without need to communicate with the backend. Drop them from the feature mask so we set them unconditionally. Reported-by: Victor Kaplansky Signed-off-by: Michael S. Tsirkin --- Changes since v1: re-add VIRTIO_NET_F_GUEST_ANNOUNCE, add a comment explaining why it's needed. hw/net/vhost_net.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 14337a4..318c3e6 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -77,14 +77,8 @@ static const int user_feature_bits[] = { VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_MRG_RXBUF, - VIRTIO_NET_F_STATUS, - VIRTIO_NET_F_CTRL_VQ, - VIRTIO_NET_F_CTRL_RX, - VIRTIO_NET_F_CTRL_VLAN, - VIRTIO_NET_F_CTRL_RX_EXTRA, - VIRTIO_NET_F_CTRL_MAC_ADDR, - VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, + /* This bit implies RARP isn't sent by QEMU out of band */ VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, -- MST