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 EDE2A1B6CF for ; Thu, 10 Jan 2019 14:18:14 +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 5D60DA404E; Thu, 10 Jan 2019 13:18:14 +0000 (UTC) Received: from localhost (unknown [10.36.118.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3FB660A35; Thu, 10 Jan 2019 13:18:07 +0000 (UTC) From: Jens Freimann To: dev@dpdk.org Cc: tiwei.bie@intel.com, maxime.coquelin@redhat.com Date: Thu, 10 Jan 2019 14:17:51 +0100 Message-Id: <20190110131751.32670-3-jfreimann@redhat.com> In-Reply-To: <20190110131751.32670-1-jfreimann@redhat.com> References: <20190110131751.32670-1-jfreimann@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.38]); Thu, 10 Jan 2019 13:18:14 +0000 (UTC) Subject: [dpdk-dev] [PATCH v2 2/2] Revert "net/virtio-user: fail if cq used with packed vq" 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: Thu, 10 Jan 2019 13:18:15 -0000 This reverts commit 5e4e7a7524a30c176bd6b1789ab30963f27f2681. Not a clean revert, I had to resolve a conflict due to 616ea5519 net/virtio-user: fix packed vq option parsing Signed-off-by: Jens Freimann --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index 49fcf48b9..b7059cb1e 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -478,15 +478,10 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, if (!in_order) dev->unsupported_features |= (1ull << VIRTIO_F_IN_ORDER); - if (packed_vq) { - if (cq) { - PMD_INIT_LOG(ERR, "control vq not supported yet with " - "packed virtqueues\n"); - return -1; - } - } else { + if (packed_vq) + dev->device_features |= (1ull << VIRTIO_F_RING_PACKED); + else dev->unsupported_features |= (1ull << VIRTIO_F_RING_PACKED); - } if (dev->mac_specified) dev->frontend_features |= (1ull << VIRTIO_NET_F_MAC); -- 2.17.2