[PATCH 2/3] telemetry: remove v23 ABI compatibility

[David Marchand <david.marchand@redhat.com>]

v23.11 is a ABI breaking release, remove compatibility code for the
previous major ABI version.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 lib/telemetry/meson.build      |  1 -
 lib/telemetry/telemetry_data.c | 33 ++++-----------------------------
 lib/telemetry/telemetry_data.h |  6 ------
 lib/telemetry/version.map      |  9 +--------
 4 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/lib/telemetry/meson.build b/lib/telemetry/meson.build
index 73750d9ef4..f84c9aa3be 100644
--- a/lib/telemetry/meson.build
+++ b/lib/telemetry/meson.build
@@ -6,4 +6,3 @@ includes = [global_inc]
 sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c')
 headers = files('rte_telemetry.h')
 includes += include_directories('../metrics')
-use_function_versioning = true
diff --git a/lib/telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c
index 0c7187bec1..3b1a2408df 100644
--- a/lib/telemetry/telemetry_data.c
+++ b/lib/telemetry/telemetry_data.c
@@ -10,7 +10,6 @@
 #undef RTE_USE_LIBBSD
 #include <stdbool.h>
 
-#include <rte_function_versioning.h>
 #include <rte_string_fns.h>
 
 #include "telemetry_data.h"
@@ -63,8 +62,8 @@ rte_tel_data_add_array_string(struct rte_tel_data *d, const char *str)
 	return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG;
 }
 
-int __vsym
-rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t x)
+int
+rte_tel_data_add_array_int(struct rte_tel_data *d, int64_t x)
 {
 	if (d->type != TEL_ARRAY_INT)
 		return -EINVAL;
@@ -74,18 +73,6 @@ rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t x)
 	return 0;
 }
 
-int __vsym
-rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int x)
-{
-	return rte_tel_data_add_array_int_v24(d, x);
-}
-
-/* mark the v23 function as the older version, and v24 as the default version */
-VERSION_SYMBOL(rte_tel_data_add_array_int, _v23, 23);
-BIND_DEFAULT_SYMBOL(rte_tel_data_add_array_int, _v24, 24);
-MAP_STATIC_SYMBOL(int rte_tel_data_add_array_int(struct rte_tel_data *d,
-		int64_t x), rte_tel_data_add_array_int_v24);
-
 int
 rte_tel_data_add_array_uint(struct rte_tel_data *d, uint64_t x)
 {
@@ -190,8 +177,8 @@ rte_tel_data_add_dict_string(struct rte_tel_data *d, const char *name,
 	return 0;
 }
 
-int __vsym
-rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t val)
+int
+rte_tel_data_add_dict_int(struct rte_tel_data *d, const char *name, int64_t val)
 {
 	struct tel_dict_entry *e = &d->data.dict[d->data_len];
 	if (d->type != TEL_DICT)
@@ -209,18 +196,6 @@ rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t
 	return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG;
 }
 
-int __vsym
-rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name, int val)
-{
-	return rte_tel_data_add_dict_int_v24(d, name, val);
-}
-
-/* mark the v23 function as the older version, and v24 as the default version */
-VERSION_SYMBOL(rte_tel_data_add_dict_int, _v23, 23);
-BIND_DEFAULT_SYMBOL(rte_tel_data_add_dict_int, _v24, 24);
-MAP_STATIC_SYMBOL(int rte_tel_data_add_dict_int(struct rte_tel_data *d,
-		const char *name, int64_t val), rte_tel_data_add_dict_int_v24);
-
 int
 rte_tel_data_add_dict_uint(struct rte_tel_data *d,
 		const char *name, uint64_t val)
diff --git a/lib/telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
index 53e4cabea5..205509c5a2 100644
--- a/lib/telemetry/telemetry_data.h
+++ b/lib/telemetry/telemetry_data.h
@@ -49,10 +49,4 @@ struct rte_tel_data {
 	} data; /* data container */
 };
 
-/* versioned functions */
-int rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int val);
-int rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t val);
-int rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name, int val);
-int rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name, int64_t val);
-
 #endif
diff --git a/lib/telemetry/version.map b/lib/telemetry/version.map
index af978b883d..7d12c92905 100644
--- a/lib/telemetry/version.map
+++ b/lib/telemetry/version.map
@@ -1,4 +1,4 @@
-DPDK_23 {
+DPDK_24 {
 	global:
 
 	rte_tel_data_add_array_container;
@@ -31,13 +31,6 @@ EXPERIMENTAL {
 	local: *;
 };
 
-DPDK_24 {
-	global:
-
-	rte_tel_data_add_array_int;
-	rte_tel_data_add_dict_int;
-} DPDK_23;
-
 INTERNAL {
 	rte_telemetry_legacy_register;
 	rte_telemetry_init;
-- 
2.41.0