From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 7 Apr 2021 18:00:37 +0000 (-0400)
Subject: Prefix lttng_enum_value and lttng_enum_entry with lttng_kernel_
X-Git-Tag: v2.13.0-rc1~20
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a28cc5201acb9aa94c2c2308ccd27cb696e4b465;p=lttng-modules.git

Prefix lttng_enum_value and lttng_enum_entry with lttng_kernel_

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I4b4d502e2af9a1ca6425889da2697c5633200f52
---

diff --git a/include/instrumentation/events/net.h b/include/instrumentation/events/net.h
index d0227423..ee171dad 100644
--- a/include/instrumentation/events/net.h
+++ b/include/instrumentation/events/net.h
@@ -235,7 +235,7 @@ static inline enum transport_header_types __get_transport_header_type(struct sk_
 	return TH_NONE;
 }
 
-static struct lttng_enum_entry proto_transport_enum_entries[] = {
+static struct lttng_kernel_enum_entry proto_transport_enum_entries[] = {
 	[0] = {
 		.start = { .value = 0, .signedness = 0, },
 		.end = { .value = IPPROTO_ICMP - 1, .signedness = 0, },
@@ -279,7 +279,7 @@ static const struct lttng_enum_desc proto_transport_header_type = {
 	.nr_entries = ARRAY_SIZE(proto_transport_enum_entries),
 };
 
-static struct lttng_enum_entry transport_enum_entries[] = {
+static struct lttng_kernel_enum_entry transport_enum_entries[] = {
 	[0] = {
 		.start = { .value = TH_NONE, .signedness = 0, },
 		.end = { .value = TH_NONE, .signedness = 0, },
diff --git a/include/lttng/events.h b/include/lttng/events.h
index 5e456c52..5e380066 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -58,13 +58,13 @@ enum channel_type {
 	METADATA_CHANNEL,
 };
 
-struct lttng_enum_value {
+struct lttng_kernel_enum_value {
 	unsigned long long value;
 	unsigned int signedness:1;
 };
 
-struct lttng_enum_entry {
-	struct lttng_enum_value start, end;	/* start and end are inclusive */
+struct lttng_kernel_enum_entry {
+	struct lttng_kernel_enum_value start, end;	/* start and end are inclusive */
 	const char *string;
 	struct {
 		unsigned int is_auto:1;
@@ -132,7 +132,7 @@ struct lttng_type {
 
 struct lttng_enum_desc {
 	const char *name;
-	const struct lttng_enum_entry *entries;
+	const struct lttng_kernel_enum_entry *entries;
 	unsigned int nr_entries;
 };
 
diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index 74e246b8..bc13e56d 100644
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -272,7 +272,7 @@ void __event_notifier_template_proto___##_name(void);
 
 #undef LTTNG_TRACEPOINT_ENUM
 #define LTTNG_TRACEPOINT_ENUM(_name, _values)				\
-	const struct lttng_enum_entry __enum_values__##_name[] = { \
+	const struct lttng_kernel_enum_entry __enum_values__##_name[] = { \
 		_values							\
 	};
 
diff --git a/include/lttng/types.h b/include/lttng/types.h
index e5e25e0e..687a0860 100644
--- a/include/lttng/types.h
+++ b/include/lttng/types.h
@@ -33,7 +33,7 @@
 
 #undef TRACE_EVENT_ENUM
 #define TRACE_EVENT_ENUM(_name, _entries...)				\
-	const struct lttng_enum_entry __trace_event_enum_##_name[] = {	\
+	const struct lttng_kernel_enum_entry __trace_event_enum_##_name[] = {	\
 		PARAMS(_entries)					\
 	};
 
diff --git a/src/lttng-events.c b/src/lttng-events.c
index a21073d3..d64440d3 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -3294,7 +3294,7 @@ int _lttng_enum_type_statedump(struct lttng_session *session,
 		goto end;
 	/* Dump all entries */
 	for (i = 0; i < nr_entries; i++) {
-		const struct lttng_enum_entry *entry = &enum_desc->entries[i];
+		const struct lttng_kernel_enum_entry *entry = &enum_desc->entries[i];
 		int j, len;
 
 		ret = print_tabs(session, nesting + 1);