From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 2B3181BA6A for ; Thu, 26 Oct 2017 00:39:28 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id t139so4726143wmt.1 for ; Wed, 25 Oct 2017 15:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=xnISDnib7KiWU89Yus/E5BqfugLrmNcknK13PAfhvW8=; b=PikS87ornlo834pSYrnqwLQm2+/3lU4xXtZvXoKngE0ZcNJ0pq/TveUoVxwunqVRN/ YoRG7ki+YxOg/0gqmXnGs6tXeXxqV4iqhjJWVDBLosycWlWNbfDqAnbRBNu8o87/ZOmR o4Jo6RqqdwmkbjQ2nL5QkVmad5sP6LHbb8QdAYYQ+md8DieuIL8m1bJXZTnDgPjedZmD O/Wtnlu39EY4aWVQZDGJhehL/hnlL7VdbEZBaIzgo8PmxnrHfgY3e954wlcbLAWM4mur /ltri9VcEpb/eVff7HOsLnxx18cmCK0OJpSTu+DvXgMoLtqRsc0QZ1UeFQNxC5KAvkub mIcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=xnISDnib7KiWU89Yus/E5BqfugLrmNcknK13PAfhvW8=; b=RlCbuv0pPDvSCf1XoBwWRhK526ENzyQkfW9BYPSX4kQHomCi/3lKpWpaceK7n4mX50 H8LWi2+rrO34Q/yjcJiVdmSes6tmO7h9pzkKTGX1VERE2ViuO7b0+V9cLZ1LpN8oVF89 RwTj9DdhFSJeyu/zd62ToottaIGB6dwhDkViPS0FqgmBv6Il8o0Q00FSwt/Y453g5b8U XdkVItJRVNYyGPWsHjHelVzB5ZmetUWaaJ4njuz8r+dBoMBlXWeGMnkS9ZmaOIIubfhL ppyvYTplZFkCUGX6p7KtfgVZMgwJNARMUwEDTlDIZmbjZaQH5QwF1tCZb5b2rhZVsTSs VqXw== X-Gm-Message-State: AMCzsaU3S7z7ug11M5GuZ6gwHR98/iuhs9bljVgdi2Fr3nCWMtYn8MKn bVD87lZbYBh7oOd1seBlwFi/g1rM X-Google-Smtp-Source: ABhQp+Ssks2DvsvE1rasuXALDaIGtatEZGkZ8nlFHcdCkE/OgqzXcKLhonlgJrVmc1IbbfiDATy9UA== X-Received: by 10.28.63.134 with SMTP id m128mr3222883wma.137.1508971167453; Wed, 25 Oct 2017 15:39:27 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id r63sm4466124wmg.13.2017.10.25.15.39.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Oct 2017 15:39:26 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 26 Oct 2017 00:38:37 +0200 Message-Id: <055603468136a7705a280f0662f685d8e1669e8f.1508970254.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v7 15/25] pci: make specialized parsing functions private 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: Wed, 25 Oct 2017 22:39:28 -0000 Do not expose the minute implementations of PCI parsing. This leaves only the all-purpose rte_pci_addr_parse, which is simpler to use. Signed-off-by: Gaetan Rivet --- doc/guides/rel_notes/deprecation.rst | 6 ++---- lib/librte_eal/common/eal_common_pci.c | 4 ++-- lib/librte_eal/common/include/rte_pci.h | 29 ----------------------------- lib/librte_eal/rte_eal_version.map | 2 -- 4 files changed, 4 insertions(+), 37 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index f3d7203..4e7f1f5 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -88,8 +88,6 @@ Deprecation Notices * pci: Several exposed functions are misnamed. The following functions are deprecated starting from v17.11 and are replaced: - - ``eal_parse_pci_BDF`` replaced by ``rte_pci_bdf_parse`` - - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_dbdf_parse`` + - ``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`` - - The functions are only renamed. Their behavior is not affected. diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index fdcf005..531dc12 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -105,7 +105,7 @@ get_u8_pciaddr_field(const char *in, void *_u8, char dlm) } -int +static int rte_pci_bdf_parse(const char *input, struct rte_pci_addr *dev_addr) { const char *in = input; @@ -129,7 +129,7 @@ eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr) return rte_pci_bdf_parse(input, dev_addr); } -int +static int rte_pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr) { const char *in = input; diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 11ba442..11ade4d 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -241,21 +241,6 @@ struct mapped_pci_resource { TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource); /** - * 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 - * The input string to be parsed. Should have the format XX:XX.X - * @param dev_addr - * The PCI Bus-Device-Function address to be returned. Domain will always be - * returned as 0 - * @return - * 0 on success, negative on error. - */ -int rte_pci_bdf_parse(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 without @@ -272,20 +257,6 @@ int rte_pci_bdf_parse(const char *input, struct rte_pci_addr *dev_addr); int eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr); /** - * Utility function to produce a PCI Bus-Device-Function value - * given a string representation. Assumes that the BDF is provided including - * a domain prefix. - * - * @param input - * The input string to be parsed. Should have the format XXXX:XX:XX.X - * @param dev_addr - * The PCI Bus-Device-Function address to be returned - * @return - * 0 on success, negative on error. - */ -int rte_pci_dbdf_parse(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 including diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index 3568694..180eee8 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -255,8 +255,6 @@ DPDK_17.11 { rte_memcpy_ptr; rte_pci_addr_cmp; rte_pci_addr_parse; - rte_pci_bdf_parse; - rte_pci_dbdf_parse; rte_pci_device_name; rte_pci_get_iommu_class; rte_pci_match; -- 2.1.4