[PATCH v3 1/2] eal: remove deprecated function returning mbuf pool ops name
From: Olivier Matz <hidden>
Date: 2018-08-07 21:34:56
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
From: Olivier Matz <redacted> rte_eal_mbuf_default_mempool_ops() is replaced by rte_mbuf_best_mempool_ops(). Signed-off-by: Olivier Matz <redacted> Reviewed-by: Anatoly Burakov <redacted> Acked-by: Santosh Shukla <redacted> --- v3: * bump ABI version and update the release notes v2: * remove rte_eal_mbuf_user_pool_ops from .map in next patch instead of this doc/guides/rel_notes/deprecation.rst | 9 --------- doc/guides/rel_notes/release_18_08.rst | 6 +++++- lib/librte_eal/bsdapp/eal/Makefile | 2 +- lib/librte_eal/bsdapp/eal/eal.c | 10 ---------- lib/librte_eal/common/include/rte_eal.h | 11 ----------- lib/librte_eal/linuxapp/eal/Makefile | 2 +- lib/librte_eal/linuxapp/eal/eal.c | 10 ---------- lib/librte_eal/meson.build | 2 +- lib/librte_eal/rte_eal_version.map | 1 - 9 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index bade1e4c4..118f962d9 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst@@ -42,15 +42,6 @@ Deprecation Notices - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_addr_parse`` - ``rte_eal_compare_pci_addr`` replaced by ``rte_pci_addr_cmp`` -* eal: a new set of mbuf mempool ops name APIs for user, platform and best - mempool names have been defined in ``rte_mbuf`` in v18.02. The uses of - ``rte_eal_mbuf_default_mempool_ops`` shall be replaced by - ``rte_mbuf_best_mempool_ops``. - The following function is deprecated since 18.05, and will be removed - in 18.08: - - - ``rte_eal_mbuf_default_mempool_ops`` - * mbuf: The opaque ``mbuf->hash.sched`` field will be updated to support generic definition in line with the ethdev TM and MTR APIs. Currently, this field is defined in librte_sched in a non-generic way. The new generic format
diff --git a/doc/guides/rel_notes/release_18_08.rst b/doc/guides/rel_notes/release_18_08.rst
index 9849fec7d..06cc38e85 100644
--- a/doc/guides/rel_notes/release_18_08.rst
+++ b/doc/guides/rel_notes/release_18_08.rst@@ -181,6 +181,10 @@ API Changes - ``RTE_COMP_FF_OOP_SGL_IN_LB_OUT`` - ``RTE_COMP_FF_OOP_LB_IN_SGL_OUT`` +* eal: The function ``rte_eal_mbuf_default_mempool_ops`` was deprecated + and is removed in 18.08. It shall be replaced by + ``rte_mbuf_best_mempool_ops``. + ABI Changes -----------
@@ -242,7 +246,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_compressdev.so.1 + librte_cryptodev.so.5 librte_distributor.so.1 - librte_eal.so.7 + + librte_eal.so.8 librte_ethdev.so.9 librte_eventdev.so.4 librte_flow_classify.so.1
diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile
index be684072e..d27da3d15 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile@@ -22,7 +22,7 @@ LDLIBS += -lrte_kvargs EXPORT_MAP := ../../rte_eal_version.map -LIBABIVER := 7 +LIBABIVER := 8 # specific to bsdapp exec-env SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) := eal.c
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 6a6dd5e85..89e8110a2 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c@@ -153,16 +153,6 @@ rte_eal_mbuf_user_pool_ops(void) return internal_config.user_mbuf_pool_ops_name; } -/* Return mbuf pool ops name */ -const char * -rte_eal_mbuf_default_mempool_ops(void) -{ - if (internal_config.user_mbuf_pool_ops_name == NULL) - return RTE_MBUF_DEFAULT_MEMPOOL_OPS; - - return internal_config.user_mbuf_pool_ops_name; -} - /* Return a pointer to the configuration structure */ struct rte_config * rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 8de5d69e8..0c9c3f13b 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h@@ -501,17 +501,6 @@ enum rte_iova_mode rte_eal_iova_mode(void); const char * __rte_experimental rte_eal_mbuf_user_pool_ops(void); -/** - * @deprecated - * Get default pool ops name for mbuf - * - * @return - * returns default pool ops name. - */ -__rte_deprecated -const char * -rte_eal_mbuf_default_mempool_ops(void); - #ifdef __cplusplus } #endif
diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index b48352825..fd92c75c2 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile@@ -10,7 +10,7 @@ ARCH_DIR ?= $(RTE_ARCH) EXPORT_MAP := ../../rte_eal_version.map VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR) -LIBABIVER := 7 +LIBABIVER := 8 VPATH += $(RTE_SDK)/lib/librte_eal/common
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index d2d5aae80..511eb062f 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c@@ -161,16 +161,6 @@ rte_eal_mbuf_user_pool_ops(void) return internal_config.user_mbuf_pool_ops_name; } -/* Return mbuf pool ops name */ -const char * -rte_eal_mbuf_default_mempool_ops(void) -{ - if (internal_config.user_mbuf_pool_ops_name == NULL) - return RTE_MBUF_DEFAULT_MEMPOOL_OPS; - - return internal_config.user_mbuf_pool_ops_name; -} - /* Return a pointer to the configuration structure */ struct rte_config * rte_eal_get_configuration(void)
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 98174476c..e1fde15d1 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build@@ -21,7 +21,7 @@ else error('unsupported system type "@0@"'.format(host_machine.system())) endif -version = 7 # the version of the EAL API +version = 8 # the version of the EAL API allow_experimental_apis = true deps += 'compat' deps += 'kvargs'
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index f18387137..de9abc812 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map@@ -181,7 +181,6 @@ DPDK_17.11 { rte_bus_get_iommu_class; rte_eal_has_pci; rte_eal_iova_mode; - rte_eal_mbuf_default_mempool_ops; rte_eal_using_phys_addrs; rte_eal_vfio_intr_mode; rte_lcore_has_role;
--
2.11.0