From patchwork Mon Dec 17 21:31:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 49023 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C73551B9D4; Mon, 17 Dec 2018 22:32:43 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id BB9A21B6C3 for ; Mon, 17 Dec 2018 22:32:42 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17031C0C2378; Mon, 17 Dec 2018 21:32:42 +0000 (UTC) Received: from localhost (ovpn-116-196.ams2.redhat.com [10.36.116.196]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B34651F0A; Mon, 17 Dec 2018 21:32:36 +0000 (UTC) From: Jens Freimann To: dev@dpdk.org Cc: tiwei.bie@intel.com, maxime.coquelin@redhat.com, Gavin.Hu@arm.com Date: Mon, 17 Dec 2018 22:31:38 +0100 Message-Id: <20181217213139.19299-10-jfreimann@redhat.com> In-Reply-To: <20181217213139.19299-1-jfreimann@redhat.com> References: <20181217213139.19299-1-jfreimann@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 17 Dec 2018 21:32:42 +0000 (UTC) Subject: [dpdk-dev] [PATCH v14 09/10] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Until we have support for control virtqueues let's disable it and fail device initalization if specified as a parameter. Signed-off-by: Jens Freimann Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index 697ba4ae8..4e331fc6a 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -467,10 +467,16 @@ 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 (packed_vq) { + if (cq) { + PMD_INIT_LOG(ERR, "control vq not supported yet with " + "packed virtqueues\n"); + return -1; + } dev->device_features |= (1ull << VIRTIO_F_RING_PACKED); - else + } else { dev->device_features &= ~(1ull << VIRTIO_F_RING_PACKED); + } if (dev->mac_specified) { dev->device_features |= (1ull << VIRTIO_NET_F_MAC);