From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 59BBF1B33A for ; Fri, 19 Jan 2018 14:48:31 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9410D1F586; Fri, 19 Jan 2018 13:48:30 +0000 (UTC) Received: from localhost (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94098614E6; Fri, 19 Jan 2018 13:48:21 +0000 (UTC) From: Stefan Hajnoczi To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, Yuanhan Liu , wei.w.wang@intel.com, mst@redhat.com, zhiyong.yang@intel.com, jasowang@redhat.com, Stefan Hajnoczi Date: Fri, 19 Jan 2018 13:44:43 +0000 Message-Id: <20180119134444.24927-24-stefanha@redhat.com> In-Reply-To: <20180119134444.24927-1-stefanha@redhat.com> References: <20180119134444.24927-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 19 Jan 2018 13:48:30 +0000 (UTC) Subject: [dpdk-dev] [RFC 23/24] WORKAROUND revert virtio-net mq vring deletion X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 13:48:31 -0000 The virtio-net mq vring deletion code should be in virtio_net.c, not in the generic vhost_user.c code where it breaks non-virtio-net devices. Signed-off-by: Stefan Hajnoczi --- drivers/librte_vhost/vhost_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/librte_vhost/vhost_user.c b/drivers/librte_vhost/vhost_user.c index a819684b4..08fab933b 100644 --- a/drivers/librte_vhost/vhost_user.c +++ b/drivers/librte_vhost/vhost_user.c @@ -163,6 +163,7 @@ vhost_user_set_features(struct virtio_net *dev, uint64_t features) (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ? "on" : "off", (dev->features & (1ULL << VIRTIO_F_VERSION_1)) ? "on" : "off"); +#if 0 if (!(dev->features & (1ULL << VIRTIO_NET_F_MQ))) { /* * Remove all but first queue pair if MQ hasn't been @@ -181,6 +182,7 @@ vhost_user_set_features(struct virtio_net *dev, uint64_t features) free_vq(vq); } } +#endif return 0; } -- 2.14.3