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 86690A32A4 for ; Fri, 25 Oct 2019 15:57:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 163BC1C24A; Fri, 25 Oct 2019 15:57:01 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id E714B1C23D for ; Fri, 25 Oct 2019 15:56:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572011819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UxQVwV1JwYIThWztSFxq1kLlLsETjEWCGUah36svxeU=; b=gkl2Kylbbo2mStn1q45dDWbPvNMKk9XU6LE/MxiGEvv+a65/+oy6h/i6kLgdmhFWSyRcNV cUm7I5ksedxZ8QzqN5UfoyYLbTQQD4z3DsYjdb/PFXMuG6VnMcdNaxzuCzZQsRmcuUDkrB U1kSm+6O5EDmYEz2bicPrhkmiwiYq3Q= 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-6-cxBtzvDpMkeq6SvMvtn6Ug-1; Fri, 25 Oct 2019 09:56:55 -0400 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 1949A107AD33; Fri, 25 Oct 2019 13:56:53 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-129.brq.redhat.com [10.40.204.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F0B010013A1; Fri, 25 Oct 2019 13:56:49 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: stephen@networkplumber.org, anatoly.burakov@intel.com, thomas@monjalon.net, ktraynor@redhat.com, Neil Horman , John McNamara , Marko Kovacevic , Gaetan Rivet Date: Fri, 25 Oct 2019 15:56:05 +0200 Message-Id: <1572011772-23271-7-git-send-email-david.marchand@redhat.com> In-Reply-To: <1572011772-23271-1-git-send-email-david.marchand@redhat.com> References: <1571736761-32134-1-git-send-email-david.marchand@redhat.com> <1572011772-23271-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: cxBtzvDpMkeq6SvMvtn6Ug-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Subject: [dpdk-dev] [PATCH v3 06/12] pci: remove deprecated functions 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" Those functions have been deprecated since 17.11 and have 1:1 replacement. Signed-off-by: David Marchand Acked-by: Thomas Monjalon --- doc/guides/rel_notes/deprecation.rst | 7 ----- doc/guides/rel_notes/release_19_11.rst | 6 +++++ lib/librte_pci/rte_pci.c | 19 -------------- lib/librte_pci/rte_pci.h | 47 ------------------------------= ---- lib/librte_pci/rte_pci_version.map | 3 --- 5 files changed, 6 insertions(+), 76 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/de= precation.rst index bbd5863..cf7744e 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -38,13 +38,6 @@ Deprecation Notices have been replaced with ``rte_dev_dma_map`` and ``rte_dev_dma_unmap`` functions. The due date for the removal targets DPDK 20.02. =20 -* pci: Several exposed functions are misnamed. - The following functions are deprecated starting from v17.11 and are repl= aced: - - - ``eal_parse_pci_BDF`` replaced by ``rte_pci_addr_parse`` - - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_addr_parse`` - - ``rte_eal_compare_pci_addr`` replaced by ``rte_pci_addr_cmp`` - * dpaa2: removal of ``rte_dpaa2_memsegs`` structure which has been replace= d by a pa-va search library. This structure was earlier being used for hol= ding memory segments used by dpaa2 driver for faster pa->va translation. This diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/= release_19_11.rst index b3f7509..8d88257 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -320,6 +320,12 @@ ABI Changes * eal: removed the ``rte_malloc_virt2phy`` function, replaced by ``rte_malloc_virt2iova`` since v17.11. =20 +* pci: removed the following deprecated functions since dpdk: + + - ``eal_parse_pci_BDF`` replaced by ``rte_pci_addr_parse`` + - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_addr_parse`` + - ``rte_eal_compare_pci_addr`` replaced by ``rte_pci_addr_cmp`` + =20 Shared Library Versions ----------------------- diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c index f400178..a753cf3 100644 --- a/lib/librte_pci/rte_pci.c +++ b/lib/librte_pci/rte_pci.c @@ -87,18 +87,6 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *d= ev_addr) =09return 0; } =20 -int -eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr) -{ -=09return pci_bdf_parse(input, dev_addr); -} - -int -eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr) -{ -=09return pci_dbdf_parse(input, dev_addr); -} - void rte_pci_device_name(const struct rte_pci_addr *addr, =09=09char *output, size_t size) @@ -110,13 +98,6 @@ rte_pci_device_name(const struct rte_pci_addr *addr, } =20 int -rte_eal_compare_pci_addr(const struct rte_pci_addr *addr, -=09=09=09 const struct rte_pci_addr *addr2) -{ -=09return rte_pci_addr_cmp(addr, addr2); -} - -int rte_pci_addr_cmp(const struct rte_pci_addr *addr, =09 const struct rte_pci_addr *addr2) { diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h index eaa9d07..c878914 100644 --- a/lib/librte_pci/rte_pci.h +++ b/lib/librte_pci/rte_pci.h @@ -106,37 +106,6 @@ struct mapped_pci_resource { TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource); =20 /** - * @deprecated - * Utility function to produce a PCI Bus-Device-Function value - * given a string representation. Assumes that the BDF is provided without - * a domain prefix (i.e. domain returned is always 0) - * - * @param input - *=09The input string to be parsed. Should have the format XX:XX.X - * @param dev_addr - *=09The PCI Bus-Device-Function address to be returned. - *=09Domain will always be returned as 0 - * @return - * 0 on success, negative on error. - */ -int eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr); - -/** - * @deprecated - * Utility function to produce a PCI Bus-Device-Function value - * given a string representation. Assumes that the BDF is provided includi= ng - * a domain prefix. - * - * @param input - *=09The input string to be parsed. Should have the format XXXX:XX:XX.X - * @param dev_addr - *=09The PCI Bus-Device-Function address to be returned - * @return - * 0 on success, negative on error. - */ -int eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr)= ; - -/** * Utility function to write a pci device name, this device name can later= be * used to retrieve the corresponding rte_pci_addr using eal_parse_pci_* * BDF helpers. @@ -152,22 +121,6 @@ void rte_pci_device_name(const struct rte_pci_addr *ad= dr, =09=09 char *output, size_t size); =20 /** - * @deprecated - * Utility function to compare two PCI device addresses. - * - * @param addr - *=09The PCI Bus-Device-Function address to compare - * @param addr2 - *=09The PCI Bus-Device-Function address to compare - * @return - *=090 on equal PCI address. - *=09Positive on addr is greater than addr2. - *=09Negative on addr is less than addr2, or error. - */ -int rte_eal_compare_pci_addr(const struct rte_pci_addr *addr, -=09=09=09 const struct rte_pci_addr *addr2); - -/** * Utility function to compare two PCI device addresses. * * @param addr diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_ve= rsion.map index c028027..03790cb 100644 --- a/lib/librte_pci/rte_pci_version.map +++ b/lib/librte_pci/rte_pci_version.map @@ -1,11 +1,8 @@ DPDK_17.11 { =09global: =20 -=09eal_parse_pci_BDF; -=09eal_parse_pci_DomBDF; =09pci_map_resource; =09pci_unmap_resource; -=09rte_eal_compare_pci_addr; =09rte_pci_addr_cmp; =09rte_pci_addr_parse; =09rte_pci_device_name; --=20 1.8.3.1