From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4981A00BE; Thu, 11 Jun 2020 23:39:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E2E142E81; Thu, 11 Jun 2020 23:38:46 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 110EB2C23 for ; Thu, 11 Jun 2020 23:38:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591911525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SD4NX8/plaM/gMQmK/X1lvZZ6c/C7tmFnhg8Z4RN8Gk=; b=IL5xUO6HZX47BnpyjKOnRN0RK7ftlDprWYX9JVrlQBHgBJ3H/RhRNqFrmr5OrwDiDKG02g P4dF0R+6gG93FymLsOki/gATc3GesNuLE/mBFh7Zj5KHlrWkiHK37hRhyF47EwvpyCh56G Mg7IXONA8BUPAY7BwbmUqGJav1y5Srg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-439-vzgadYPVNGKzbRLHdhPZdA-1; Thu, 11 Jun 2020 17:38:42 -0400 X-MC-Unique: vzgadYPVNGKzbRLHdhPZdA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 800A018A0732; Thu, 11 Jun 2020 21:38:40 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.110.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE1311001B0B; Thu, 11 Jun 2020 21:38:31 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, matan@mellanox.com, xiao.w.wang@intel.com, zhihong.wang@intel.com, xiaolong.ye@intel.com, chenbo.xia@intel.com, david.marchand@redhat.com, amorenoz@redhat.com, shreyansh.jain@nxp.com, viacheslavo@mellanox.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com Cc: Maxime Coquelin Date: Thu, 11 Jun 2020 23:37:42 +0200 Message-Id: <20200611213748.1967029-9-maxime.coquelin@redhat.com> In-Reply-To: <20200611213748.1967029-1-maxime.coquelin@redhat.com> References: <20200611213748.1967029-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 08/14] vhost: remove useless vDPA API 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" vDPA is no more used outside of the vDPA internals, so remove rte_vdpa_get_device() API that is now useless. Signed-off-by: Maxime Coquelin --- lib/librte_vhost/rte_vdpa.h | 30 ----------------- lib/librte_vhost/rte_vhost_version.map | 1 - lib/librte_vhost/vdpa.c | 46 ++++++-------------------- 3 files changed, 10 insertions(+), 67 deletions(-) diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h index 6188bf6483..ca6cb0e882 100644 --- a/lib/librte_vhost/rte_vdpa.h +++ b/lib/librte_vhost/rte_vdpa.h @@ -134,36 +134,6 @@ __rte_experimental struct rte_device * rte_vdpa_get_rte_device(struct rte_vdpa_device *vdpa_dev); -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Find the device id of a vdpa device - * - * @param addr - * the vdpa device address - * @return - * device id on success, -1 on failure - */ -__rte_experimental -int -rte_vdpa_find_device_id(struct rte_vdpa_device *dev); - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Find a vdpa device based on device id - * - * @param did - * device id - * @return - * rte_vdpa_device on success, NULL on failure - */ -__rte_experimental -struct rte_vdpa_device * -rte_vdpa_get_device(int did); - /** * @warning * @b EXPERIMENTAL: this API may change without prior notice diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map index 43caab7553..27d63ce6fe 100644 --- a/lib/librte_vhost/rte_vhost_version.map +++ b/lib/librte_vhost/rte_vhost_version.map @@ -36,7 +36,6 @@ EXPERIMENTAL { rte_vdpa_register_device; rte_vdpa_unregister_device; rte_vdpa_find_device_id; - rte_vdpa_get_device; rte_vdpa_get_device_num; rte_vhost_driver_attach_vdpa_device; rte_vhost_driver_detach_vdpa_device; diff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c index 9ec5677a78..ae4df4521d 100644 --- a/lib/librte_vhost/vdpa.c +++ b/lib/librte_vhost/vdpa.c @@ -19,27 +19,6 @@ static struct rte_vdpa_device vdpa_devices[MAX_VHOST_DEVICE]; static uint32_t vdpa_device_num; -int -rte_vdpa_find_device_id(struct rte_vdpa_device *dev) -{ - struct rte_vdpa_device *tmp_dev; - int i; - - if (dev == NULL) - return -1; - - for (i = 0; i < MAX_VHOST_DEVICE; ++i) { - tmp_dev = &vdpa_devices[i]; - if (tmp_dev->ops == NULL) - continue; - - if (tmp_dev == dev) - return i; - } - - return -1; -} - struct rte_vdpa_device * rte_vdpa_find_device_by_name(const char *name) { @@ -70,15 +49,6 @@ rte_vdpa_get_rte_device(struct rte_vdpa_device *vdpa_dev) return vdpa_dev->device; } -struct rte_vdpa_device * -rte_vdpa_get_device(int did) -{ - if (did < 0 || did >= MAX_VHOST_DEVICE) - return NULL; - - return &vdpa_devices[did]; -} - struct rte_vdpa_device * rte_vdpa_register_device(struct rte_device *rte_dev, struct rte_vdpa_dev_ops *ops) @@ -117,15 +87,19 @@ rte_vdpa_register_device(struct rte_device *rte_dev, int rte_vdpa_unregister_device(struct rte_vdpa_device *vdev) { - int did = rte_vdpa_find_device_id(vdev); + int i; - if (did < 0 || vdpa_devices[did].ops == NULL) - return -1; + for (i = 0; i < MAX_VHOST_DEVICE; i++) { + if (vdev != &vdpa_devices[i]) + continue; - memset(&vdpa_devices[did], 0, sizeof(struct rte_vdpa_device)); - vdpa_device_num--; + memset(vdev, 0, sizeof(struct rte_vdpa_device)); + vdpa_device_num--; - return 0; + return 0; + } + + return -1; } int -- 2.26.2