From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 5 Jul 2018 15:08:40 +0000 (-0400)
Subject: trackers: bump MI version to 4.0
X-Git-Tag: v2.12.0-rc1~101
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=01fac81494c061d122404aa1dbafc8d7bc93fb3d;p=lttng-tools.git

trackers: bump MI version to 4.0

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I0a44262016cf90e0629be5cb7d8b5976462c62d9
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a40ec0d29..95935b76e 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -22,7 +22,7 @@ DIST_SUBDIRS = \
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi-lttng-3.0.xsd
+EXTRA_DIST = mi-lttng-4.0.xsd
 
 libcommon_la_SOURCES = \
 	action.c \
diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
deleted file mode 100644
index 218d5bd98..000000000
--- a/src/common/mi-lttng-3.0.xsd
+++ /dev/null
@@ -1,936 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2014 - Oliver Cotte <olivier.cotte@polymtl.ca>
-                   - Jonathan Rajotte <jonathan.r.julien@gmail.com>
-Copyright (c) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-<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="3.0">
-
-	<!-- Maps to the uint32_t type -->
-	<xs:simpleType name="uint32_type">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0" />
-			<xs:maxInclusive value="4294967295" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the uint64_t type -->
-	<xs:simpleType name="uint64_type">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0" />
-			<xs:maxInclusive value="18446744073709551615" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!--
-	Maps to the range allowed for blocking timeout: -1 (block
-	forever), 0 (do not block), positive integer value (blocking
-	time in usec) limited by its signed 32-bit representation when
-	converted to msec.
-	-->
-	<xs:simpleType name="blocking_timeout_type">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="-1" />
-			<xs:maxInclusive value="2147483648000" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the char name[LTTNG_SYMBOL_NAME_LEN] -->
-	<xs:simpleType name="name_type">
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="255" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_event_type enum -->
-	<xs:simpleType name="event_type_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ALL" />
-			<xs:enumeration value="TRACEPOINT" />
-			<xs:enumeration value="PROBE" />
-			<xs:enumeration value="FUNCTION" />
-			<xs:enumeration value="FUNCTION_ENTRY" />
-			<xs:enumeration value="NOOP" />
-			<xs:enumeration value="SYSCALL" />
-			<xs:enumeration value="USERSPACE_PROBE" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_event_field_type enum -->
-	<xs:simpleType name="event_field_type_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OTHER" />
-			<xs:enumeration value="INTEGER" />
-			<xs:enumeration value="ENUM" />
-			<xs:enumeration value="FLOAT" />
-			<xs:enumeration value="STRING" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_loglevel_type enum -->
-	<xs:simpleType name="loglevel_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ALL" />
-			<xs:enumeration value="RANGE" />
-			<xs:enumeration value="SINGLE" />
-			<xs:enumeration value="UNKNOWN" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_event_context_type enum -->
-	<xs:simpleType name="context_type_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="PID" />
-			<xs:enumeration value="PROCNAME" />
-			<xs:enumeration value="PRIO" />
-			<xs:enumeration value="NICE" />
-			<xs:enumeration value="VPID" />
-			<xs:enumeration value="TID" />
-			<xs:enumeration value="VTID" />
-			<xs:enumeration value="PPID" />
-			<xs:enumeration value="VPPID" />
-			<xs:enumeration value="PTHREAD_ID" />
-			<xs:enumeration value="HOSTNAME" />
-			<xs:enumeration value="IP" />
-			<xs:enumeration value="INTERRUPTIBLE" />
-			<xs:enumeration value="PREEMPTIBLE" />
-			<xs:enumeration value="NEED_RESCHEDULE" />
-			<xs:enumeration value="MIGRATABLE" />
-			<xs:enumeration value="CALLSTACK_USER" />
-			<xs:enumeration value="CALLSTACK_KERNEL" />
-			<xs:enumeration value="CGROUP_NS" />
-			<xs:enumeration value="IPC_NS" />
-			<xs:enumeration value="MNT_NS" />
-			<xs:enumeration value="NET_NS" />
-			<xs:enumeration value="PID_NS" />
-			<xs:enumeration value="USER_NS" />
-			<xs:enumeration value="UTS_NS" />
-			<xs:enumeration value="UID" />
-			<xs:enumeration value="EUID" />
-			<xs:enumeration value="SUID" />
-			<xs:enumeration value="GID" />
-			<xs:enumeration value="EGID" />
-			<xs:enumeration value="SGID" />
-			<xs:enumeration value="VUID" />
-			<xs:enumeration value="VEUID" />
-			<xs:enumeration value="VSUID" />
-			<xs:enumeration value="VGID" />
-			<xs:enumeration value="VEGID" />
-			<xs:enumeration value="VSGID" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to loglevel_string char * -->
-	<xs:simpleType name="loglevel_string_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="" />
-			<xs:enumeration value="TRACE_EMERG" />
-			<xs:enumeration value="TRACE_ALERT" />
-			<xs:enumeration value="TRACE_CRIT" />
-			<xs:enumeration value="TRACE_ERR" />
-			<xs:enumeration value="TRACE_WARNING" />
-			<xs:enumeration value="TRACE_NOTICE" />
-			<xs:enumeration value="TRACE_INFO" />
-			<xs:enumeration value="TRACE_DEBUG_SYSTEM" />
-			<xs:enumeration value="TRACE_DEBUG_PROGRAM" />
-			<xs:enumeration value="TRACE_DEBUG_PROCESS" />
-			<xs:enumeration value="TRACE_DEBUG_MODULE" />
-			<xs:enumeration value="TRACE_DEBUG_UNIT" />
-			<xs:enumeration value="TRACE_DEBUG_FUNCTION" />
-			<xs:enumeration value="TRACE_DEBUG_LINE" />
-			<xs:enumeration value="TRACE_DEBUG" />
-			<xs:enumeration value="JUL_OFF" />
-			<xs:enumeration value="JUL_SEVERE" />
-			<xs:enumeration value="JUL_WARNING" />
-			<xs:enumeration value="JUL_INFO" />
-			<xs:enumeration value="JUL_CONFIG" />
-			<xs:enumeration value="JUL_FINE" />
-			<xs:enumeration value="JUL_FINER" />
-			<xs:enumeration value="JUL_FINEST" />
-			<xs:enumeration value="JUL_ALL" />
-			<xs:enumeration value="LOG4J_OFF" />
-			<xs:enumeration value="LOG4J_FATAL" />
-			<xs:enumeration value="LOG4J_ERROR" />
-			<xs:enumeration value="LOG4J_WARN" />
-			<xs:enumeration value="LOG4J_INFO" />
-			<xs:enumeration value="LOG4J_DEBUG" />
-			<xs:enumeration value="LOG4J_TRACE" />
-			<xs:enumeration value="LOG4J_ALL" />
-			<xs:enumeration value="PYTHON_CRITICAL" />
-			<xs:enumeration value="PYTHON_ERROR" />
-			<xs:enumeration value="PYTHON_WARNING" />
-			<xs:enumeration value="PYTHON_INFO" />
-			<xs:enumeration value="PYTHON_DEBUG" />
-			<xs:enumeration value="PYTHON_NOTSET" />
-			<xs:enumeration value="UNKNOWN" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to enum lttng_rotation_state -->
-	<xs:simpleType name="rotation_state_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ONGOING" />
-			<xs:enumeration value="COMPLETED" />
-			<xs:enumeration value="EXPIRED" />
-			<xs:enumeration value="ERROR" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to enum lttng_trace_archive_location_relay_protocol_type -->
-	<xs:simpleType name="location_relay_protocol_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="TCP" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_calibrate_type enum -->
-	<xs:simpleType name="calibrate_type_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="FUNCTION" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_event_probe_attr struct -->
-	<xs:complexType name="event_probe_attributes_type">
-		<xs:all>
-			<xs:element name="address" type="tns:uint64_type" minOccurs="0" />
-			<xs:element name="offset" type="tns:uint64_type" minOccurs="0" />
-			<xs:element name="symbol_name" type="tns:name_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to the lttng_event_function_attr struct -->
-	<xs:complexType name="event_ftrace_attributes_type">
-		<xs:all>
-			<xs:element name="symbol_name" type="tns:name_type" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to per event type configuration -->
-	<xs:complexType name="event_attributes_type">
-		<xs:choice>
-			<xs:element name="probe_attributes" type="tns:event_probe_attributes_type" />
-			<xs:element name="function_attributes" type="tns:event_ftrace_attributes_type" />
-		</xs:choice>
-	</xs:complexType>
-
-	<!-- Maps to exclusion type -->
-	<xs:complexType name="event_exclusion_list_type">
-		<xs:sequence>
-			<xs:element name="exclusion" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to lttng_event struct -->
-	<xs:complexType name="event_type">
-		<xs:all>
-			<xs:element name="type" type="tns:event_type_type" default="TRACEPOINT" minOccurs="0" />
-			<xs:element name="name" type="tns:name_type" minOccurs="0" />
-			<xs:element name="loglevel_type" type="tns:loglevel_type" default="ALL" minOccurs="0" />
-			<xs:element name="loglevel" type="tns:loglevel_string_type" default="" minOccurs="0" />
-			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
-			<xs:element name="filter_expression" type="xs:string" minOccurs="0" />
-			<xs:element name="exclusions" type="tns:event_exclusion_list_type" minOccurs="0"/>
-			<xs:element name="attributes" type="tns:event_attributes_type" minOccurs="0" />
-			<xs:element name="event_fields" type="tns:event_fields_type" minOccurs="0" />
-			<xs:element name="success" type="xs:boolean" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to mi_lttng_version struct -->
-	<xs:complexType name="version_type">
-		<xs:all>
-			<xs:element name="name" type="tns:name_type" />
-			<xs:element name="string" type="tns:name_type" />
-			<xs:element name="major" type="tns:uint32_type" />
-			<xs:element name="url" type="xs:string" />
-			<xs:element name="minor" type="tns:uint32_type" />
-			<xs:element name="commit" type="xs:string" />
-			<xs:element name="license" type="xs:string" />
-			<xs:element name="patchLevel" type="tns:uint32_type" />
-			<xs:element name="description" type="xs:string" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to an array of event -->
-	<xs:complexType name="event_list_type">
-		<xs:sequence>
-			<xs:element name="event" type="tns:event_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to the lttng_domain_type enum -->
-	<xs:simpleType name="domain_type_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="KERNEL"/>
-			<xs:enumeration value="UST"/>
-			<xs:enumeration value="JUL"/>
-			<xs:enumeration value="LOG4J"/>
-			<xs:enumeration value="PYTHON"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_buffer_type enum -->
-	<xs:simpleType name="domain_buffer_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="PER_PID"/>
-			<xs:enumeration value="PER_UID"/>
-			<xs:enumeration value="GLOBAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the type mode of a channel -->
-	<xs:simpleType name="channel_overwrite_mode_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="DISCARD" />
-			<xs:enumeration value="OVERWRITE" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to the lttng_event_output enum -->
-	<xs:simpleType name="event_output_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="SPLICE" />
-			<xs:enumeration value="MMAP" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- map to a pid -->
-	<xs:complexType name="pid_type">
-		<xs:all>
-			<xs:element name="id" type="xs:int" />
-			<xs:element name="name" type="tns:name_type" />
-			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- maps to an array of pid -->
-	<xs:complexType name="pids_type">
-		<xs:sequence>
-			<xs:element name="pid" type="tns:pid_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:simpleType name="tracker_target_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ALL" />
-			<xs:enumeration value="NONE" />
-			<xs:enumeration value="LIST" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="pidbyint">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="4294967295" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="pid_target_type_choice">
-		<xs:choice>
-			<xs:element name="id" type="tns:pidbyint" />
-			<xs:element name="name" type="xs:string" />
-			<xs:element name="all" type="xs:boolean" />
-		</xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="pid_target_type">
-		<xs:all>
-			<xs:element name="type" type="tns:pid_target_type_choice" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a list of pid_targets-->
-	<xs:complexType name="pid_targets_type">
-		<xs:sequence>
-			<xs:element name="pid_target" type="tns:pid_target_type" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to a pid_tracker-->
-	<xs:complexType name="pid_tracker_type">
-		<xs:all>
-			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
-			<xs:element name="targets" type="tns:pid_targets_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:simpleType name="vpidbyint">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="4294967295" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="vpid_target_type_choice">
-		<xs:choice>
-			<xs:element name="id" type="tns:vpidbyint" />
-			<xs:element name="name" type="xs:string" />
-			<xs:element name="all" type="xs:boolean" />
-		</xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="vpid_target_type">
-		<xs:all>
-			<xs:element name="type" type="tns:vpid_target_type_choice" minOccurs="0" maxOccurs="1" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a list of vpid_targets-->
-	<xs:complexType name="vpid_targets_type">
-		<xs:sequence>
-			<xs:element name="vpid_target" type="tns:vpid_target_type" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to a vpid_tracker-->
-	<xs:complexType name="vpid_tracker_type">
-		<xs:all>
-			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
-			<xs:element name="targets" type="tns:vpid_targets_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:simpleType name="uidbyint">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="4294967295" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="uid_target_type_choice">
-		<xs:choice>
-			<xs:element name="id" type="tns:uidbyint" />
-			<xs:element name="name" type="xs:string" />
-			<xs:element name="all" type="xs:boolean" />
-		</xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="uid_target_type">
-		<xs:all>
-			<xs:element name="type" type="tns:uid_target_type_choice" minOccurs="0" maxOccurs="1" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a list of uid_targets-->
-	<xs:complexType name="uid_targets_type">
-		<xs:sequence>
-			<xs:element name="uid_target" type="tns:uid_target_type" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to a uid_tracker-->
-	<xs:complexType name="uid_tracker_type">
-		<xs:all>
-			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
-			<xs:element name="targets" type="tns:uid_targets_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:simpleType name="vuidbyint">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="4294967295" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="vuid_target_type_choice">
-		<xs:choice>
-			<xs:element name="id" type="tns:vuidbyint" />
-			<xs:element name="name" type="xs:string" />
-			<xs:element name="all" type="xs:boolean" />
-		</xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="vuid_target_type">
-		<xs:all>
-			<xs:element name="type" type="tns:vuid_target_type_choice" minOccurs="0" maxOccurs="1" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a list of vuid_targets-->
-	<xs:complexType name="vuid_targets_type">
-		<xs:sequence>
-			<xs:element name="vuid_target" type="tns:vuid_target_type" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to a vuid_tracker-->
-	<xs:complexType name="vuid_tracker_type">
-		<xs:all>
-			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
-			<xs:element name="targets" type="tns:vuid_targets_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:simpleType name="gidbyint">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="4294967295" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="gid_target_type_choice">
-		<xs:choice>
-			<xs:element name="id" type="tns:gidbyint" />
-			<xs:element name="name" type="xs:string" />
-			<xs:element name="all" type="xs:boolean" />
-		</xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="gid_target_type">
-		<xs:all>
-			<xs:element name="type" type="tns:gid_target_type_choice" minOccurs="0" maxOccurs="1" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a list of gid_targets-->
-	<xs:complexType name="gid_targets_type">
-		<xs:sequence>
-			<xs:element name="gid_target" type="tns:gid_target_type" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to a gid_tracker-->
-	<xs:complexType name="gid_tracker_type">
-		<xs:all>
-			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
-			<xs:element name="targets" type="tns:gid_targets_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:simpleType name="vgidbyint">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="4294967295" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="vgid_target_type_choice">
-		<xs:choice>
-			<xs:element name="id" type="tns:vgidbyint" />
-			<xs:element name="name" type="xs:string" />
-			<xs:element name="all" type="xs:boolean" />
-		</xs:choice>
-	</xs:complexType>
-
-	<xs:complexType name="vgid_target_type">
-		<xs:all>
-			<xs:element name="type" type="tns:vgid_target_type_choice" minOccurs="0" maxOccurs="1" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a list of vgid_targets-->
-	<xs:complexType name="vgid_targets_type">
-		<xs:sequence>
-			<xs:element name="vgid_target" type="tns:vgid_target_type" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to a vgid_tracker-->
-	<xs:complexType name="vgid_tracker_type">
-		<xs:all>
-			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
-			<xs:element name="targets" type="tns:vgid_targets_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a list of trackers-->
-	<xs:complexType name="trackers_type">
-		<xs:sequence>
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element name="pid_tracker" type="tns:pid_tracker_type" maxOccurs="1" />
-				<xs:element name="vpid_tracker" type="tns:vpid_tracker_type" maxOccurs="1" />
-				<xs:element name="uid_tracker" type="tns:uid_tracker_type" maxOccurs="1" />
-				<xs:element name="vuid_tracker" type="tns:vuid_tracker_type" maxOccurs="1" />
-				<xs:element name="gid_tracker" type="tns:gid_tracker_type" maxOccurs="1" />
-				<xs:element name="vgid_tracker" type="tns:vgid_tracker_type" maxOccurs="1" />
-			</xs:choice>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to struct lttng_domain and contains channels -->
-	<xs:complexType name="domain_type">
-		<xs:all>
-			<xs:element name="type" type="tns:domain_type_type" />
-			<xs:element name="buffer_type" type="tns:domain_buffer_type" />
-			<xs:element name="pids" type="tns:pids_type" minOccurs="0" />
-			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
-			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
-			<xs:element name="trackers" type="tns:trackers_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to struct lttng_channel -->
-	<xs:complexType name="channel_type">
-		<xs:all>
-			<xs:element name="name" type="tns:name_type" />
-			<xs:element name="enabled" type="xs:boolean" default="true" minOccurs="0" />
-			<xs:element name="attributes" type="tns:channel_attributes_type" minOccurs="0" />
-			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to struct lttng_channel_attr -->
-	<xs:complexType name="channel_attributes_type">
-		<xs:all>
-			<xs:element name="overwrite_mode" type="tns:channel_overwrite_mode_type" default="DISCARD" minOccurs="0" />
-			<xs:element name="subbuffer_size" type="tns:uint64_type" minOccurs="0" /> <!-- bytes -->
-			<xs:element name="subbuffer_count" type="tns:uint64_type" default="4" minOccurs="0" />
-			<xs:element name="switch_timer_interval" type="tns:uint32_type" default="0" minOccurs="0" />  <!-- usec -->
-			<xs:element name="read_timer_interval" type="tns:uint32_type" />  <!-- usec -->
-			<xs:element name="output_type" type="tns:event_output_type" />
-			<xs:element name="tracefile_size" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- bytes -->
-			<xs:element name="tracefile_count" type="tns:uint64_type" default="0" minOccurs="0" />
-			<xs:element name="live_timer_interval" type="tns:uint32_type" default="0" minOccurs="0" /> <!-- usec -->
-			<xs:element name="discarded_events" type="tns:uint64_type" default="0" minOccurs="0" />
-			<xs:element name="lost_packets" type="tns:uint64_type" default="0" minOccurs="0" />
-			<xs:element name="monitor_timer_interval" type="tns:uint64_type" default="0" minOccurs="0" />
-			<xs:element name="blocking_timeout" type="tns:blocking_timeout_type" default="0" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to struct lttng_snapshot_output -->
-	<xs:complexType name="snapshot_type">
-		<xs:all>
-			<xs:element name="id" type="tns:uint32_type" minOccurs="0" />
-			<xs:element name="max_size" type="tns:uint64_type" minOccurs="0" />
-			<xs:element name="name" type="tns:name_type" minOccurs="0" />
-			<xs:element name="session_name" type="tns:name_type" minOccurs="0" />
-			<xs:element name="ctrl_url" type="xs:string" minOccurs="0" />
-			<xs:element name="data_url" type="xs:string" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:complexType name="snapshots_type">
-		<xs:sequence>
-			<xs:element name="snapshot" type="tns:snapshot_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="periodic_rotation_schedule_type">
-		<xs:all>
-			<xs:element name="time_us" type="tns:uint64_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:complexType name="size_threshold_rotation_schedule_type">
-		<xs:all>
-			<xs:element name="bytes" type="tns:uint64_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<xs:complexType name="rotation_schedule_type">
-		<xs:sequence>
-			<xs:choice maxOccurs="unbounded">
-				<xs:element name="periodic" type="tns:periodic_rotation_schedule_type" maxOccurs="unbounded" />
-				<xs:element name="size_threshold" type="tns:size_threshold_rotation_schedule_type" maxOccurs="unbounded" />
-			</xs:choice>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="channels_type">
-		<xs:sequence>
-			<xs:element name="channel" type="tns:channel_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to a lttng_session -->
-	<xs:complexType name="session_type">
-		<xs:all>
-			<xs:element name="name" type="tns:name_type" />
-			<xs:element name="path" type="xs:string" minOccurs="0" />
-			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
-			<xs:element name="snapshot_mode" type="tns:uint32_type" minOccurs="0" />
-			<xs:element name="live_timer_interval" type="tns:uint32_type" minOccurs="0" />
-			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
-			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
-			<xs:element name="snapshots" type="tns:snapshots_type" minOccurs="0" />
-			<xs:element name="rotation_schedules" type="tns:rotation_schedule_type" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to a lttng_event_field -->
-	<xs:complexType name="event_field_type">
-		<xs:all>
-			<xs:element name="name" type="tns:name_type" />
-			<xs:element name="type" type="tns:event_field_type_type" />
-			<xs:element name="nowrite" type="xs:int" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to the save command -->
-	<xs:complexType name="save_type">
-		<xs:all>
-			<xs:element name="session" type="tns:session_type" />
-			<xs:element name="path" type="xs:string" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to the load command -->
-	<xs:complexType name="load_type">
-		<xs:all>
-			<xs:element name="session" type="tns:session_type" />
-			<xs:element name="path" type="xs:string" />
-			<xs:element name="overrides" type="tns:overrides_type" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to the override parameters of the load command -->
-	<xs:complexType name="overrides_type">
-		<xs:all>
-			<xs:element name="name" type="tns:name_type" minOccurs="0" />
-			<xs:element name="url" type="xs:string" minOccurs="0" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to struct lttng_calibrate -->
-	<xs:complexType name="calibrate_type">
-		<xs:all>
-			<xs:element name="type" type="tns:calibrate_type_type" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to lttng_event_perf_counter_ctx -->
-	<xs:complexType name="perf_counter_context_type">
-		<xs:all>
-			<xs:element name="type" type="tns:uint32_type" />
-			<xs:element name="config" type="tns:uint64_type" />
-			<xs:element name="name" type="tns:name_type" />
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to app_ctx -->
-	<xs:complexType name="app_context_type">
-		<xs:all>
-			<xs:element name="provider_name" type="xs:string"/>
-			<xs:element name="ctx_name" type="xs:string"/>
-		</xs:all>
-	</xs:complexType>
-
-	<!-- Maps to lttng_event_context -->
-	<xs:complexType name="context_type">
-		<xs:sequence>
-			<xs:choice>
-				<xs:element name="type" type="tns:context_type_type"/>
-				<xs:element name="perf" type="tns:perf_counter_context_type"/>
-				<xs:element name="app" type="tns:app_context_type"/>
-			</xs:choice>
-			<xs:element name="symbol" type="xs:string" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to an array of domain -->
-	<xs:complexType name="domains_type">
-		<xs:sequence>
-			<xs:element name="domain" type="tns:domain_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to an array of session -->
-	<xs:complexType name="sessions_type">
-		<xs:sequence>
-			<xs:element name="session" type="tns:session_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to an array of event_field -->
-	<xs:complexType name="event_fields_type">
-		<xs:sequence>
-			<xs:element name="event_field" type="tns:event_field_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to an array of context -->
-	<xs:complexType name="contexts_type">
-		<xs:sequence>
-			<xs:element name="context" type="tns:context_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to an action during snapshot command -->
-	<xs:complexType name="snapshot_cmd_type">
-		<xs:sequence>
-			<xs:element name="name" type="tns:snapshot_action_type" minOccurs="0" />
-			<xs:element name="output" type="tns:output_type" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Type of snapshot commands -->
-	<xs:simpleType name="snapshot_action_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="list-output" />
-			<xs:enumeration value="del-output" />
-			<xs:enumeration value="add-output" />
-			<xs:enumeration value="record-output" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Maps to an action during metadata command -->
-	<xs:complexType name="metadata_cmd_type">
-		<xs:sequence>
-			<xs:element name="name" type="tns:metadata_action_type" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Type of metadata commands -->
-	<xs:simpleType name="metadata_action_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="regenerate" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Type of regenerate commands -->
-	<xs:simpleType name="regenerate_action_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="metadata" />
-			<xs:enumeration value="statedump" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Type of regenerate command -->
-	<xs:complexType name="regenerate_cmd_type">
-		<xs:sequence>
-			<xs:element name="name" type="tns:regenerate_action_type" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="local_location_type">
-		<xs:sequence>
-			<xs:element name="absolute_path" type="xs:string" minOccurs="1" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="relay_location_type">
-		<xs:sequence>
-			<xs:element name="host" type="xs:string" minOccurs="1" />
-			<xs:element name="control_port" type="xs:int" minOccurs="0" />
-			<xs:element name="data_port" type="xs:int" minOccurs="0" />
-			<xs:element name="protocol" type="tns:location_relay_protocol_type" minOccurs="1" />
-			<xs:element name="relative_path" type="xs:string" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="location_type">
-		<xs:choice>
-			<xs:element name="local" type="tns:local_location_type" minOccurs="0" />
-			<xs:element name="relay" type="tns:relay_location_type" minOccurs="0" />
-		</xs:choice>
-	</xs:complexType>
-
-	<!-- Maps to the rotate command -->
-	<xs:complexType name="rotate_type">
-		<xs:sequence>
-			<xs:element name="session_name" type="tns:name_type" minOccurs="1" />
-			<xs:element name="state" type="tns:rotation_state_type" minOccurs="1" />
-			<xs:element name="location" type="tns:location_type" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="rotation_schedule_result_type">
-		<xs:sequence>
-		  	<xs:element name="rotation_schedule" type="tns:rotation_schedule_type" minOccurs="1" />
-			<xs:element name="success" type="xs:boolean" minOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<!-- Maps to the enable/disable-rotation commands -->
-	<xs:complexType name="rotation_schedule_cmd_type">
-		<xs:sequence>
-			<xs:element name="session_name" type="tns:name_type" minOccurs="1" />
-			<xs:element name="rotation_schedule_result" type="tns:rotation_schedule_result_type" minOccurs="1" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="output_type">
-		<xs:choice>
-			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
-			<xs:element name="sessions" type="tns:sessions_type" minOccurs="0" />
-			<xs:element name="session" type="tns:session_type" minOccurs="0" />
-			<xs:element name="snapshot_action" type="tns:snapshot_cmd_type" minOccurs="0" />
-			<xs:element name="snapshot" type="tns:snapshot_type" minOccurs="0" />
-			<xs:element name="version" type="tns:version_type" minOccurs="0" />
-			<xs:element name="save" type="tns:save_type" minOccurs="0" />
-			<xs:element name="load" type="tns:load_type" minOccurs="0" />
-			<xs:element name="calibrate" type="tns:calibrate_type" minOccurs="0" />
-			<xs:element name="contexts" type="tns:contexts_type" minOccurs="0" />
-			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
-			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
-			<xs:element name="channel" type="tns:channel_type" minOccurs="0" />
-			<xs:element name="trackers" type="tns:trackers_type" minOccurs="0" />
-			<xs:element name="metadata_action" type="tns:metadata_cmd_type" minOccurs="0" />
-			<xs:element name="regenerate_action" type="tns:regenerate_cmd_type" minOccurs="0" />
-			<xs:element name="rotation" type="tns:rotate_type" minOccurs="0" />
-			<xs:element name="rotation_schedule_results" type="tns:rotation_schedule_cmd_type" minOccurs="0" />
-		</xs:choice>
-	</xs:complexType>
-
-	<!-- Maps to the mi_lttng commands -->
-	<xs:simpleType name="command_string_type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="create" />
-			<xs:enumeration value="list" />
-			<xs:enumeration value="snapshot" />
-			<xs:enumeration value="version" />
-			<xs:enumeration value="save" />
-			<xs:enumeration value="load" />
-			<xs:enumeration value="start" />
-			<xs:enumeration value="stop" />
-			<xs:enumeration value="destroy" />
-			<xs:enumeration value="calibrate" />
-			<xs:enumeration value="add-context" />
-			<xs:enumeration value="enable-channel" />
-			<xs:enumeration value="enable-event" />
-			<xs:enumeration value="set-session" />
-			<xs:enumeration value="disable-event" />
-			<xs:enumeration value="disable-channel" />
-			<xs:enumeration value="track" />
-			<xs:enumeration value="untrack" />
-			<xs:enumeration value="metadata" />
-			<xs:enumeration value="regenerate" />
-			<xs:enumeration value="rotate" />
-			<xs:enumeration value="enable-rotation" />
-			<xs:enumeration value="disable-rotation" />
-			<xs:enumeration value="clear" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:element name="command">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="name" type="tns:command_string_type" maxOccurs="1" />
-				<xs:element name="output" type="tns:output_type" maxOccurs="1" />
-				<xs:element name="success" type="xs:boolean" minOccurs="0" maxOccurs="1" />
-			</xs:all>
-			<xs:attribute name="schemaVersion" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/src/common/mi-lttng-4.0.xsd b/src/common/mi-lttng-4.0.xsd
new file mode 100644
index 000000000..a6a7af699
--- /dev/null
+++ b/src/common/mi-lttng-4.0.xsd
@@ -0,0 +1,936 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2014 - Oliver Cotte <olivier.cotte@polymtl.ca>
+                   - Jonathan Rajotte <jonathan.r.julien@gmail.com>
+Copyright (c) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<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">
+
+	<!-- Maps to the uint32_t type -->
+	<xs:simpleType name="uint32_type">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0" />
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the uint64_t type -->
+	<xs:simpleType name="uint64_type">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0" />
+			<xs:maxInclusive value="18446744073709551615" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!--
+	Maps to the range allowed for blocking timeout: -1 (block
+	forever), 0 (do not block), positive integer value (blocking
+	time in usec) limited by its signed 32-bit representation when
+	converted to msec.
+	-->
+	<xs:simpleType name="blocking_timeout_type">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="-1" />
+			<xs:maxInclusive value="2147483648000" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the char name[LTTNG_SYMBOL_NAME_LEN] -->
+	<xs:simpleType name="name_type">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="255" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_event_type enum -->
+	<xs:simpleType name="event_type_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ALL" />
+			<xs:enumeration value="TRACEPOINT" />
+			<xs:enumeration value="PROBE" />
+			<xs:enumeration value="FUNCTION" />
+			<xs:enumeration value="FUNCTION_ENTRY" />
+			<xs:enumeration value="NOOP" />
+			<xs:enumeration value="SYSCALL" />
+			<xs:enumeration value="USERSPACE_PROBE" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_event_field_type enum -->
+	<xs:simpleType name="event_field_type_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OTHER" />
+			<xs:enumeration value="INTEGER" />
+			<xs:enumeration value="ENUM" />
+			<xs:enumeration value="FLOAT" />
+			<xs:enumeration value="STRING" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_loglevel_type enum -->
+	<xs:simpleType name="loglevel_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ALL" />
+			<xs:enumeration value="RANGE" />
+			<xs:enumeration value="SINGLE" />
+			<xs:enumeration value="UNKNOWN" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_event_context_type enum -->
+	<xs:simpleType name="context_type_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="PID" />
+			<xs:enumeration value="PROCNAME" />
+			<xs:enumeration value="PRIO" />
+			<xs:enumeration value="NICE" />
+			<xs:enumeration value="VPID" />
+			<xs:enumeration value="TID" />
+			<xs:enumeration value="VTID" />
+			<xs:enumeration value="PPID" />
+			<xs:enumeration value="VPPID" />
+			<xs:enumeration value="PTHREAD_ID" />
+			<xs:enumeration value="HOSTNAME" />
+			<xs:enumeration value="IP" />
+			<xs:enumeration value="INTERRUPTIBLE" />
+			<xs:enumeration value="PREEMPTIBLE" />
+			<xs:enumeration value="NEED_RESCHEDULE" />
+			<xs:enumeration value="MIGRATABLE" />
+			<xs:enumeration value="CALLSTACK_USER" />
+			<xs:enumeration value="CALLSTACK_KERNEL" />
+			<xs:enumeration value="CGROUP_NS" />
+			<xs:enumeration value="IPC_NS" />
+			<xs:enumeration value="MNT_NS" />
+			<xs:enumeration value="NET_NS" />
+			<xs:enumeration value="PID_NS" />
+			<xs:enumeration value="USER_NS" />
+			<xs:enumeration value="UTS_NS" />
+			<xs:enumeration value="UID" />
+			<xs:enumeration value="EUID" />
+			<xs:enumeration value="SUID" />
+			<xs:enumeration value="GID" />
+			<xs:enumeration value="EGID" />
+			<xs:enumeration value="SGID" />
+			<xs:enumeration value="VUID" />
+			<xs:enumeration value="VEUID" />
+			<xs:enumeration value="VSUID" />
+			<xs:enumeration value="VGID" />
+			<xs:enumeration value="VEGID" />
+			<xs:enumeration value="VSGID" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to loglevel_string char * -->
+	<xs:simpleType name="loglevel_string_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="" />
+			<xs:enumeration value="TRACE_EMERG" />
+			<xs:enumeration value="TRACE_ALERT" />
+			<xs:enumeration value="TRACE_CRIT" />
+			<xs:enumeration value="TRACE_ERR" />
+			<xs:enumeration value="TRACE_WARNING" />
+			<xs:enumeration value="TRACE_NOTICE" />
+			<xs:enumeration value="TRACE_INFO" />
+			<xs:enumeration value="TRACE_DEBUG_SYSTEM" />
+			<xs:enumeration value="TRACE_DEBUG_PROGRAM" />
+			<xs:enumeration value="TRACE_DEBUG_PROCESS" />
+			<xs:enumeration value="TRACE_DEBUG_MODULE" />
+			<xs:enumeration value="TRACE_DEBUG_UNIT" />
+			<xs:enumeration value="TRACE_DEBUG_FUNCTION" />
+			<xs:enumeration value="TRACE_DEBUG_LINE" />
+			<xs:enumeration value="TRACE_DEBUG" />
+			<xs:enumeration value="JUL_OFF" />
+			<xs:enumeration value="JUL_SEVERE" />
+			<xs:enumeration value="JUL_WARNING" />
+			<xs:enumeration value="JUL_INFO" />
+			<xs:enumeration value="JUL_CONFIG" />
+			<xs:enumeration value="JUL_FINE" />
+			<xs:enumeration value="JUL_FINER" />
+			<xs:enumeration value="JUL_FINEST" />
+			<xs:enumeration value="JUL_ALL" />
+			<xs:enumeration value="LOG4J_OFF" />
+			<xs:enumeration value="LOG4J_FATAL" />
+			<xs:enumeration value="LOG4J_ERROR" />
+			<xs:enumeration value="LOG4J_WARN" />
+			<xs:enumeration value="LOG4J_INFO" />
+			<xs:enumeration value="LOG4J_DEBUG" />
+			<xs:enumeration value="LOG4J_TRACE" />
+			<xs:enumeration value="LOG4J_ALL" />
+			<xs:enumeration value="PYTHON_CRITICAL" />
+			<xs:enumeration value="PYTHON_ERROR" />
+			<xs:enumeration value="PYTHON_WARNING" />
+			<xs:enumeration value="PYTHON_INFO" />
+			<xs:enumeration value="PYTHON_DEBUG" />
+			<xs:enumeration value="PYTHON_NOTSET" />
+			<xs:enumeration value="UNKNOWN" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to enum lttng_rotation_state -->
+	<xs:simpleType name="rotation_state_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ONGOING" />
+			<xs:enumeration value="COMPLETED" />
+			<xs:enumeration value="EXPIRED" />
+			<xs:enumeration value="ERROR" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to enum lttng_trace_archive_location_relay_protocol_type -->
+	<xs:simpleType name="location_relay_protocol_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="TCP" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_calibrate_type enum -->
+	<xs:simpleType name="calibrate_type_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="FUNCTION" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_event_probe_attr struct -->
+	<xs:complexType name="event_probe_attributes_type">
+		<xs:all>
+			<xs:element name="address" type="tns:uint64_type" minOccurs="0" />
+			<xs:element name="offset" type="tns:uint64_type" minOccurs="0" />
+			<xs:element name="symbol_name" type="tns:name_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to the lttng_event_function_attr struct -->
+	<xs:complexType name="event_ftrace_attributes_type">
+		<xs:all>
+			<xs:element name="symbol_name" type="tns:name_type" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to per event type configuration -->
+	<xs:complexType name="event_attributes_type">
+		<xs:choice>
+			<xs:element name="probe_attributes" type="tns:event_probe_attributes_type" />
+			<xs:element name="function_attributes" type="tns:event_ftrace_attributes_type" />
+		</xs:choice>
+	</xs:complexType>
+
+	<!-- Maps to exclusion type -->
+	<xs:complexType name="event_exclusion_list_type">
+		<xs:sequence>
+			<xs:element name="exclusion" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to lttng_event struct -->
+	<xs:complexType name="event_type">
+		<xs:all>
+			<xs:element name="type" type="tns:event_type_type" default="TRACEPOINT" minOccurs="0" />
+			<xs:element name="name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="loglevel_type" type="tns:loglevel_type" default="ALL" minOccurs="0" />
+			<xs:element name="loglevel" type="tns:loglevel_string_type" default="" minOccurs="0" />
+			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
+			<xs:element name="filter_expression" type="xs:string" minOccurs="0" />
+			<xs:element name="exclusions" type="tns:event_exclusion_list_type" minOccurs="0"/>
+			<xs:element name="attributes" type="tns:event_attributes_type" minOccurs="0" />
+			<xs:element name="event_fields" type="tns:event_fields_type" minOccurs="0" />
+			<xs:element name="success" type="xs:boolean" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to mi_lttng_version struct -->
+	<xs:complexType name="version_type">
+		<xs:all>
+			<xs:element name="name" type="tns:name_type" />
+			<xs:element name="string" type="tns:name_type" />
+			<xs:element name="major" type="tns:uint32_type" />
+			<xs:element name="url" type="xs:string" />
+			<xs:element name="minor" type="tns:uint32_type" />
+			<xs:element name="commit" type="xs:string" />
+			<xs:element name="license" type="xs:string" />
+			<xs:element name="patchLevel" type="tns:uint32_type" />
+			<xs:element name="description" type="xs:string" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to an array of event -->
+	<xs:complexType name="event_list_type">
+		<xs:sequence>
+			<xs:element name="event" type="tns:event_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to the lttng_domain_type enum -->
+	<xs:simpleType name="domain_type_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="KERNEL"/>
+			<xs:enumeration value="UST"/>
+			<xs:enumeration value="JUL"/>
+			<xs:enumeration value="LOG4J"/>
+			<xs:enumeration value="PYTHON"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_buffer_type enum -->
+	<xs:simpleType name="domain_buffer_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="PER_PID"/>
+			<xs:enumeration value="PER_UID"/>
+			<xs:enumeration value="GLOBAL"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the type mode of a channel -->
+	<xs:simpleType name="channel_overwrite_mode_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="DISCARD" />
+			<xs:enumeration value="OVERWRITE" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to the lttng_event_output enum -->
+	<xs:simpleType name="event_output_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="SPLICE" />
+			<xs:enumeration value="MMAP" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- map to a pid -->
+	<xs:complexType name="pid_type">
+		<xs:all>
+			<xs:element name="id" type="xs:int" />
+			<xs:element name="name" type="tns:name_type" />
+			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- maps to an array of pid -->
+	<xs:complexType name="pids_type">
+		<xs:sequence>
+			<xs:element name="pid" type="tns:pid_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:simpleType name="tracker_target_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ALL" />
+			<xs:enumeration value="NONE" />
+			<xs:enumeration value="LIST" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="pidbyint">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="pid_target_type_choice">
+		<xs:choice>
+			<xs:element name="id" type="tns:pidbyint" />
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="all" type="xs:boolean" />
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="pid_target_type">
+		<xs:all>
+			<xs:element name="type" type="tns:pid_target_type_choice" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a list of pid_targets-->
+	<xs:complexType name="pid_targets_type">
+		<xs:sequence>
+			<xs:element name="pid_target" type="tns:pid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to a pid_tracker-->
+	<xs:complexType name="pid_tracker_type">
+		<xs:all>
+			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
+			<xs:element name="targets" type="tns:pid_targets_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:simpleType name="vpidbyint">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="vpid_target_type_choice">
+		<xs:choice>
+			<xs:element name="id" type="tns:vpidbyint" />
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="all" type="xs:boolean" />
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="vpid_target_type">
+		<xs:all>
+			<xs:element name="type" type="tns:vpid_target_type_choice" minOccurs="0" maxOccurs="1" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a list of vpid_targets-->
+	<xs:complexType name="vpid_targets_type">
+		<xs:sequence>
+			<xs:element name="vpid_target" type="tns:vpid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to a vpid_tracker-->
+	<xs:complexType name="vpid_tracker_type">
+		<xs:all>
+			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
+			<xs:element name="targets" type="tns:vpid_targets_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:simpleType name="uidbyint">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="uid_target_type_choice">
+		<xs:choice>
+			<xs:element name="id" type="tns:uidbyint" />
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="all" type="xs:boolean" />
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="uid_target_type">
+		<xs:all>
+			<xs:element name="type" type="tns:uid_target_type_choice" minOccurs="0" maxOccurs="1" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a list of uid_targets-->
+	<xs:complexType name="uid_targets_type">
+		<xs:sequence>
+			<xs:element name="uid_target" type="tns:uid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to a uid_tracker-->
+	<xs:complexType name="uid_tracker_type">
+		<xs:all>
+			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
+			<xs:element name="targets" type="tns:uid_targets_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:simpleType name="vuidbyint">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="vuid_target_type_choice">
+		<xs:choice>
+			<xs:element name="id" type="tns:vuidbyint" />
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="all" type="xs:boolean" />
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="vuid_target_type">
+		<xs:all>
+			<xs:element name="type" type="tns:vuid_target_type_choice" minOccurs="0" maxOccurs="1" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a list of vuid_targets-->
+	<xs:complexType name="vuid_targets_type">
+		<xs:sequence>
+			<xs:element name="vuid_target" type="tns:vuid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to a vuid_tracker-->
+	<xs:complexType name="vuid_tracker_type">
+		<xs:all>
+			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
+			<xs:element name="targets" type="tns:vuid_targets_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:simpleType name="gidbyint">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="gid_target_type_choice">
+		<xs:choice>
+			<xs:element name="id" type="tns:gidbyint" />
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="all" type="xs:boolean" />
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="gid_target_type">
+		<xs:all>
+			<xs:element name="type" type="tns:gid_target_type_choice" minOccurs="0" maxOccurs="1" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a list of gid_targets-->
+	<xs:complexType name="gid_targets_type">
+		<xs:sequence>
+			<xs:element name="gid_target" type="tns:gid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to a gid_tracker-->
+	<xs:complexType name="gid_tracker_type">
+		<xs:all>
+			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
+			<xs:element name="targets" type="tns:gid_targets_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:simpleType name="vgidbyint">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="vgid_target_type_choice">
+		<xs:choice>
+			<xs:element name="id" type="tns:vgidbyint" />
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="all" type="xs:boolean" />
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="vgid_target_type">
+		<xs:all>
+			<xs:element name="type" type="tns:vgid_target_type_choice" minOccurs="0" maxOccurs="1" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a list of vgid_targets-->
+	<xs:complexType name="vgid_targets_type">
+		<xs:sequence>
+			<xs:element name="vgid_target" type="tns:vgid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to a vgid_tracker-->
+	<xs:complexType name="vgid_tracker_type">
+		<xs:all>
+			<xs:element name="target_type" type="tns:tracker_target_type" minOccurs="0" maxOccurs="1" />
+			<xs:element name="targets" type="tns:vgid_targets_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a list of trackers-->
+	<xs:complexType name="trackers_type">
+		<xs:sequence>
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:element name="pid_tracker" type="tns:pid_tracker_type" maxOccurs="1" />
+				<xs:element name="vpid_tracker" type="tns:vpid_tracker_type" maxOccurs="1" />
+				<xs:element name="uid_tracker" type="tns:uid_tracker_type" maxOccurs="1" />
+				<xs:element name="vuid_tracker" type="tns:vuid_tracker_type" maxOccurs="1" />
+				<xs:element name="gid_tracker" type="tns:gid_tracker_type" maxOccurs="1" />
+				<xs:element name="vgid_tracker" type="tns:vgid_tracker_type" maxOccurs="1" />
+			</xs:choice>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to struct lttng_domain and contains channels -->
+	<xs:complexType name="domain_type">
+		<xs:all>
+			<xs:element name="type" type="tns:domain_type_type" />
+			<xs:element name="buffer_type" type="tns:domain_buffer_type" />
+			<xs:element name="pids" type="tns:pids_type" minOccurs="0" />
+			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
+			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
+			<xs:element name="trackers" type="tns:trackers_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to struct lttng_channel -->
+	<xs:complexType name="channel_type">
+		<xs:all>
+			<xs:element name="name" type="tns:name_type" />
+			<xs:element name="enabled" type="xs:boolean" default="true" minOccurs="0" />
+			<xs:element name="attributes" type="tns:channel_attributes_type" minOccurs="0" />
+			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to struct lttng_channel_attr -->
+	<xs:complexType name="channel_attributes_type">
+		<xs:all>
+			<xs:element name="overwrite_mode" type="tns:channel_overwrite_mode_type" default="DISCARD" minOccurs="0" />
+			<xs:element name="subbuffer_size" type="tns:uint64_type" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="subbuffer_count" type="tns:uint64_type" default="4" minOccurs="0" />
+			<xs:element name="switch_timer_interval" type="tns:uint32_type" default="0" minOccurs="0" />  <!-- usec -->
+			<xs:element name="read_timer_interval" type="tns:uint32_type" />  <!-- usec -->
+			<xs:element name="output_type" type="tns:event_output_type" />
+			<xs:element name="tracefile_size" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="tracefile_count" type="tns:uint64_type" default="0" minOccurs="0" />
+			<xs:element name="live_timer_interval" type="tns:uint32_type" default="0" minOccurs="0" /> <!-- usec -->
+			<xs:element name="discarded_events" type="tns:uint64_type" default="0" minOccurs="0" />
+			<xs:element name="lost_packets" type="tns:uint64_type" default="0" minOccurs="0" />
+			<xs:element name="monitor_timer_interval" type="tns:uint64_type" default="0" minOccurs="0" />
+			<xs:element name="blocking_timeout" type="tns:blocking_timeout_type" default="0" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to struct lttng_snapshot_output -->
+	<xs:complexType name="snapshot_type">
+		<xs:all>
+			<xs:element name="id" type="tns:uint32_type" minOccurs="0" />
+			<xs:element name="max_size" type="tns:uint64_type" minOccurs="0" />
+			<xs:element name="name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="session_name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="ctrl_url" type="xs:string" minOccurs="0" />
+			<xs:element name="data_url" type="xs:string" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:complexType name="snapshots_type">
+		<xs:sequence>
+			<xs:element name="snapshot" type="tns:snapshot_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="periodic_rotation_schedule_type">
+		<xs:all>
+			<xs:element name="time_us" type="tns:uint64_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:complexType name="size_threshold_rotation_schedule_type">
+		<xs:all>
+			<xs:element name="bytes" type="tns:uint64_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:complexType name="rotation_schedule_type">
+		<xs:sequence>
+			<xs:choice maxOccurs="unbounded">
+				<xs:element name="periodic" type="tns:periodic_rotation_schedule_type" maxOccurs="unbounded" />
+				<xs:element name="size_threshold" type="tns:size_threshold_rotation_schedule_type" maxOccurs="unbounded" />
+			</xs:choice>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="channels_type">
+		<xs:sequence>
+			<xs:element name="channel" type="tns:channel_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to a lttng_session -->
+	<xs:complexType name="session_type">
+		<xs:all>
+			<xs:element name="name" type="tns:name_type" />
+			<xs:element name="path" type="xs:string" minOccurs="0" />
+			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
+			<xs:element name="snapshot_mode" type="tns:uint32_type" minOccurs="0" />
+			<xs:element name="live_timer_interval" type="tns:uint32_type" minOccurs="0" />
+			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
+			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
+			<xs:element name="snapshots" type="tns:snapshots_type" minOccurs="0" />
+			<xs:element name="rotation_schedules" type="tns:rotation_schedule_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to a lttng_event_field -->
+	<xs:complexType name="event_field_type">
+		<xs:all>
+			<xs:element name="name" type="tns:name_type" />
+			<xs:element name="type" type="tns:event_field_type_type" />
+			<xs:element name="nowrite" type="xs:int" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to the save command -->
+	<xs:complexType name="save_type">
+		<xs:all>
+			<xs:element name="session" type="tns:session_type" />
+			<xs:element name="path" type="xs:string" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to the load command -->
+	<xs:complexType name="load_type">
+		<xs:all>
+			<xs:element name="session" type="tns:session_type" />
+			<xs:element name="path" type="xs:string" />
+			<xs:element name="overrides" type="tns:overrides_type" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to the override parameters of the load command -->
+	<xs:complexType name="overrides_type">
+		<xs:all>
+			<xs:element name="name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="url" type="xs:string" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to struct lttng_calibrate -->
+	<xs:complexType name="calibrate_type">
+		<xs:all>
+			<xs:element name="type" type="tns:calibrate_type_type" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to lttng_event_perf_counter_ctx -->
+	<xs:complexType name="perf_counter_context_type">
+		<xs:all>
+			<xs:element name="type" type="tns:uint32_type" />
+			<xs:element name="config" type="tns:uint64_type" />
+			<xs:element name="name" type="tns:name_type" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to app_ctx -->
+	<xs:complexType name="app_context_type">
+		<xs:all>
+			<xs:element name="provider_name" type="xs:string"/>
+			<xs:element name="ctx_name" type="xs:string"/>
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to lttng_event_context -->
+	<xs:complexType name="context_type">
+		<xs:sequence>
+			<xs:choice>
+				<xs:element name="type" type="tns:context_type_type"/>
+				<xs:element name="perf" type="tns:perf_counter_context_type"/>
+				<xs:element name="app" type="tns:app_context_type"/>
+			</xs:choice>
+			<xs:element name="symbol" type="xs:string" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to an array of domain -->
+	<xs:complexType name="domains_type">
+		<xs:sequence>
+			<xs:element name="domain" type="tns:domain_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to an array of session -->
+	<xs:complexType name="sessions_type">
+		<xs:sequence>
+			<xs:element name="session" type="tns:session_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to an array of event_field -->
+	<xs:complexType name="event_fields_type">
+		<xs:sequence>
+			<xs:element name="event_field" type="tns:event_field_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to an array of context -->
+	<xs:complexType name="contexts_type">
+		<xs:sequence>
+			<xs:element name="context" type="tns:context_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to an action during snapshot command -->
+	<xs:complexType name="snapshot_cmd_type">
+		<xs:sequence>
+			<xs:element name="name" type="tns:snapshot_action_type" minOccurs="0" />
+			<xs:element name="output" type="tns:output_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Type of snapshot commands -->
+	<xs:simpleType name="snapshot_action_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="list-output" />
+			<xs:enumeration value="del-output" />
+			<xs:enumeration value="add-output" />
+			<xs:enumeration value="record-output" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Maps to an action during metadata command -->
+	<xs:complexType name="metadata_cmd_type">
+		<xs:sequence>
+			<xs:element name="name" type="tns:metadata_action_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Type of metadata commands -->
+	<xs:simpleType name="metadata_action_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="regenerate" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Type of regenerate commands -->
+	<xs:simpleType name="regenerate_action_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="metadata" />
+			<xs:enumeration value="statedump" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Type of regenerate command -->
+	<xs:complexType name="regenerate_cmd_type">
+		<xs:sequence>
+			<xs:element name="name" type="tns:regenerate_action_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="local_location_type">
+		<xs:sequence>
+			<xs:element name="absolute_path" type="xs:string" minOccurs="1" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="relay_location_type">
+		<xs:sequence>
+			<xs:element name="host" type="xs:string" minOccurs="1" />
+			<xs:element name="control_port" type="xs:int" minOccurs="0" />
+			<xs:element name="data_port" type="xs:int" minOccurs="0" />
+			<xs:element name="protocol" type="tns:location_relay_protocol_type" minOccurs="1" />
+			<xs:element name="relative_path" type="xs:string" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="location_type">
+		<xs:choice>
+			<xs:element name="local" type="tns:local_location_type" minOccurs="0" />
+			<xs:element name="relay" type="tns:relay_location_type" minOccurs="0" />
+		</xs:choice>
+	</xs:complexType>
+
+	<!-- Maps to the rotate command -->
+	<xs:complexType name="rotate_type">
+		<xs:sequence>
+			<xs:element name="session_name" type="tns:name_type" minOccurs="1" />
+			<xs:element name="state" type="tns:rotation_state_type" minOccurs="1" />
+			<xs:element name="location" type="tns:location_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="rotation_schedule_result_type">
+		<xs:sequence>
+		  	<xs:element name="rotation_schedule" type="tns:rotation_schedule_type" minOccurs="1" />
+			<xs:element name="success" type="xs:boolean" minOccurs="1"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to the enable/disable-rotation commands -->
+	<xs:complexType name="rotation_schedule_cmd_type">
+		<xs:sequence>
+			<xs:element name="session_name" type="tns:name_type" minOccurs="1" />
+			<xs:element name="rotation_schedule_result" type="tns:rotation_schedule_result_type" minOccurs="1" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="output_type">
+		<xs:choice>
+			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
+			<xs:element name="sessions" type="tns:sessions_type" minOccurs="0" />
+			<xs:element name="session" type="tns:session_type" minOccurs="0" />
+			<xs:element name="snapshot_action" type="tns:snapshot_cmd_type" minOccurs="0" />
+			<xs:element name="snapshot" type="tns:snapshot_type" minOccurs="0" />
+			<xs:element name="version" type="tns:version_type" minOccurs="0" />
+			<xs:element name="save" type="tns:save_type" minOccurs="0" />
+			<xs:element name="load" type="tns:load_type" minOccurs="0" />
+			<xs:element name="calibrate" type="tns:calibrate_type" minOccurs="0" />
+			<xs:element name="contexts" type="tns:contexts_type" minOccurs="0" />
+			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
+			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
+			<xs:element name="channel" type="tns:channel_type" minOccurs="0" />
+			<xs:element name="trackers" type="tns:trackers_type" minOccurs="0" />
+			<xs:element name="metadata_action" type="tns:metadata_cmd_type" minOccurs="0" />
+			<xs:element name="regenerate_action" type="tns:regenerate_cmd_type" minOccurs="0" />
+			<xs:element name="rotation" type="tns:rotate_type" minOccurs="0" />
+			<xs:element name="rotation_schedule_results" type="tns:rotation_schedule_cmd_type" minOccurs="0" />
+		</xs:choice>
+	</xs:complexType>
+
+	<!-- Maps to the mi_lttng commands -->
+	<xs:simpleType name="command_string_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="create" />
+			<xs:enumeration value="list" />
+			<xs:enumeration value="snapshot" />
+			<xs:enumeration value="version" />
+			<xs:enumeration value="save" />
+			<xs:enumeration value="load" />
+			<xs:enumeration value="start" />
+			<xs:enumeration value="stop" />
+			<xs:enumeration value="destroy" />
+			<xs:enumeration value="calibrate" />
+			<xs:enumeration value="add-context" />
+			<xs:enumeration value="enable-channel" />
+			<xs:enumeration value="enable-event" />
+			<xs:enumeration value="set-session" />
+			<xs:enumeration value="disable-event" />
+			<xs:enumeration value="disable-channel" />
+			<xs:enumeration value="track" />
+			<xs:enumeration value="untrack" />
+			<xs:enumeration value="metadata" />
+			<xs:enumeration value="regenerate" />
+			<xs:enumeration value="rotate" />
+			<xs:enumeration value="enable-rotation" />
+			<xs:enumeration value="disable-rotation" />
+			<xs:enumeration value="clear" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:element name="command">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="name" type="tns:command_string_type" maxOccurs="1" />
+				<xs:element name="output" type="tns:output_type" maxOccurs="1" />
+				<xs:element name="success" type="xs:boolean" minOccurs="0" maxOccurs="1" />
+			</xs:all>
+			<xs:attribute name="schemaVersion" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index 8eb049122..3feff4ac5 100755
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -19,7 +19,7 @@ TEST_DESC="Machine interface testing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
 
 #Test app for ust event
 TESTAPP_PATH="$TESTDIR/utils/testapp"
diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust
index 85d7197e6..5749f5a47 100755
--- a/tests/regression/tools/relayd-grouping/test_ust
+++ b/tests/regression/tools/relayd-grouping/test_ust
@@ -27,7 +27,7 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 EVENT_NAME="tp:tptest"
 CHANNEL_NAME="my_channel"
 
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
 
 XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
 XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"
diff --git a/tests/regression/tools/rotation/test_save_load_mi b/tests/regression/tools/rotation/test_save_load_mi
index 494d375f6..80500b40f 100755
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -29,7 +29,7 @@ source $CURDIR/rotate_utils.sh
 # Overwrite the lttng_bin to get mi output
 LTTNG_BIN="lttng --mi xml"
 
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
 
 XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
 XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"