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 82AD71BB3B for ; Fri, 14 Dec 2018 17:00:40 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E152A307B978; Fri, 14 Dec 2018 16:00:39 +0000 (UTC) Received: from localhost (ovpn-117-84.ams2.redhat.com [10.36.117.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1083B5C1A1; Fri, 14 Dec 2018 16:00:19 +0000 (UTC) From: Jens Freimann To: dev@dpdk.org Cc: tiwei.bie@intel.com, maxime.coquelin@redhat.com, Gavin.Hu@arm.com Date: Fri, 14 Dec 2018 16:59:15 +0100 Message-Id: <20181214155916.1142-10-jfreimann@redhat.com> In-Reply-To: <20181214155916.1142-1-jfreimann@redhat.com> References: <20181214155916.1142-1-jfreimann@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 14 Dec 2018 16:00:39 +0000 (UTC) Subject: [dpdk-dev] [PATCH v13 09/10] net/virtio-user: fail if q 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: Fri, 14 Dec 2018 16:00:40 -0000 Until we have support for ctrl virtqueues let's disable it and fail device initalization if specified as a parameter. Signed-off-by: Jens Freimann --- 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..14597eb73 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 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); -- 2.17.2