From patchwork Thu Dec 13 12:34:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 48778 X-Patchwork-Delegate: thomas@monjalon.net 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 B42D01B55A; Thu, 13 Dec 2018 13:36:28 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A885A1B54B for ; Thu, 13 Dec 2018 13:36:27 +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 11B03C0669A3; Thu, 13 Dec 2018 12:36:27 +0000 (UTC) Received: from localhost (unknown [10.36.118.169]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 105C3614E6; Thu, 13 Dec 2018 12:36:16 +0000 (UTC) From: Jens Freimann To: dev@dpdk.org Cc: tiwei.bie@intel.com, maxime.coquelin@redhat.com, Gavin.Hu@arm.com Date: Thu, 13 Dec 2018 13:34:52 +0100 Message-Id: <20181213123453.15035-10-jfreimann@redhat.com> In-Reply-To: <20181213123453.15035-1-jfreimann@redhat.com> References: <20181213123453.15035-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.32]); Thu, 13 Dec 2018 12:36:27 +0000 (UTC) Subject: [dpdk-dev] [PATCH v12 09/10] net/virtio-user: ctrl virtqueue not supported with packed vqs 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 ctrl virtqueues let's disable it and exit if specified as a parameter. Signed-off-by: Jens Freimann --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 8 ++++++-- 1 file changed, 6 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..f9b83c423 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -467,10 +467,14 @@ 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) + rte_exit(EXIT_FAILURE, + "control vq not supported with packed virtqueues\n"); 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);