From 1f1f7e351ffdd153226d92e29ae621630c6a3fe1 Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Mon, 7 Jun 2021 18:11:01 -0400
Subject: [PATCH] MI: xsd: bump to 4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

No breaking change were done to the xsd. Only objects related to
triggers, event-rules, actions, condition, and error-query were added.
They do not interfere with the current MI.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ia057c0fbea34f8e5c48cb8d8d307f004acc95a00
---
 src/common/Makefile.am                            | 2 +-
 src/common/{mi-lttng-4.0.xsd => mi-lttng-4.1.xsd} | 2 +-
 src/common/mi-lttng.c                             | 2 +-
 tests/utils/utils.sh                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/common/{mi-lttng-4.0.xsd => mi-lttng-4.1.xsd} (99%)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 9c66a7658..5d1904d9c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -35,7 +35,7 @@ DIST_SUBDIRS = \
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi-lttng-4.0.xsd
+EXTRA_DIST = mi-lttng-4.1.xsd
 
 libcommon_la_SOURCES = \
 	actions/action.c \
diff --git a/src/common/mi-lttng-4.0.xsd b/src/common/mi-lttng-4.1.xsd
similarity index 99%
rename from src/common/mi-lttng-4.0.xsd
rename to src/common/mi-lttng-4.1.xsd
index fa128905a..7493e4f4f 100644
--- a/src/common/mi-lttng-4.0.xsd
+++ b/src/common/mi-lttng-4.1.xsd
@@ -10,7 +10,7 @@ SPDX-License-Identifier: MIT
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="https://lttng.org/xml/ns/lttng-mi"
 	xmlns:tns="https://lttng.org/xml/ns/lttng-mi"
-	elementFormDefault="qualified" version="4.0">
+	elementFormDefault="qualified" version="4.1">
 
 	<!-- Maps to the uint32_t type -->
 	<xs:simpleType name="uint32_type">
diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index 4da97deed..aaca5946c 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -19,7 +19,7 @@
 #include <assert.h>
 
 #define MI_SCHEMA_MAJOR_VERSION 4
-#define MI_SCHEMA_MINOR_VERSION 0
+#define MI_SCHEMA_MINOR_VERSION 1
 
 /* Machine interface namespace URI */
 LTTNG_HIDDEN const char * const mi_lttng_xmlns = "xmlns";
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 517b96a5a..44cc31404 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -16,7 +16,7 @@ BABELTRACE_BIN="babeltrace"
 OUTPUT_DEST=/dev/null
 ERROR_OUTPUT_DEST=/dev/null
 MI_XSD_MAJOR_VERSION=4
-MI_XSD_MINOR_VERSION=0
+MI_XSD_MINOR_VERSION=1
 MI_XSD_PATH="$TESTDIR/../src/common/mi-lttng-${MI_XSD_MAJOR_VERSION}.${MI_XSD_MINOR_VERSION}.xsd"
 MI_VALIDATE="$TESTDIR/utils/xml-utils/validate_xml ${MI_XSD_PATH}"
 
-- 
2.34.1