From d2a36c595842e4ede4b232c1c88480ef8b75f3a9 Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Wed, 4 Jul 2018 14:08:16 +0200
Subject: [PATCH] base: define generic config XSD types globally

The new base/xsd/config.inc defines generic XSD types such as 'Boolean' or
'Session_label'. It can be included in config XSD files by using:

! <xs:include schemaLocation="file://${GENODE_CONFIG_INC}"/>

The string ${GENODE_CONFIG_INC} is replaced by the run tool with the
above mentionened file path.

Issue #2897
---
 repos/base/xsd/base_types.xsd             | 35 ++++++++++++
 repos/os/src/app/ping/config.xsd          | 39 +------------
 repos/os/src/app/trace_logger/config.xsd  | 39 +------------
 repos/os/src/init/config.xsd              | 68 ++++++++++++-----------
 repos/os/src/server/nic_bridge/config.xsd | 31 +----------
 repos/os/src/server/nic_dump/config.xsd   | 13 +----
 repos/os/src/server/nic_router/config.xsd | 56 +++----------------
 repos/os/src/test/net_flood/config.xsd    | 24 +-------
 repos/os/xsd/net_types.xsd                | 29 ++++++++++
 repos/os/xsd/timeout_types.xsd            | 11 ++++
 tool/run/run                              | 16 ++++--
 11 files changed, 141 insertions(+), 220 deletions(-)
 create mode 100644 repos/base/xsd/base_types.xsd
 create mode 100644 repos/os/xsd/net_types.xsd
 create mode 100644 repos/os/xsd/timeout_types.xsd

diff --git a/repos/base/xsd/base_types.xsd b/repos/base/xsd/base_types.xsd
new file mode 100644
index 000000000..7a8fa74e5
--- /dev/null
+++ b/repos/base/xsd/base_types.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<xs:simpleType name="Boolean">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="true" />
+			<xs:enumeration value="yes" />
+			<xs:enumeration value="on" />
+			<xs:enumeration value="false" />
+			<xs:enumeration value="no" />
+			<xs:enumeration value="off" />
+		</xs:restriction>
+	</xs:simpleType><!-- Boolean -->
+
+	<xs:simpleType name="Thread_name">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1"/>
+			<xs:maxLength value="40"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Thread_name -->
+
+	<xs:simpleType name="Number_of_bytes">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Number_of_bytes -->
+
+	<xs:simpleType name="Session_label">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1"/>
+			<xs:maxLength value="160"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Session_label -->
+
+</xs:schema>
diff --git a/repos/os/src/app/ping/config.xsd b/repos/os/src/app/ping/config.xsd
index 0ceaca064..f8c6e92b7 100644
--- a/repos/os/src/app/ping/config.xsd
+++ b/repos/os/src/app/ping/config.xsd
@@ -1,23 +1,9 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:simpleType name="Boolean">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="true" />
-			<xs:enumeration value="yes" />
-			<xs:enumeration value="on" />
-			<xs:enumeration value="false" />
-			<xs:enumeration value="no" />
-			<xs:enumeration value="off" />
-		</xs:restriction>
-	</xs:simpleType><!-- Boolean -->
-
-	<xs:simpleType name="Port">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="65535"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Port -->
+	<xs:include schemaLocation="base_types.xsd"/>
+	<xs:include schemaLocation="net_types.xsd"/>
+	<xs:include schemaLocation="timeout_types.xsd"/>
 
 	<xs:simpleType name="Protocol">
 		<xs:restriction base="xs:string">
@@ -26,25 +12,6 @@
 		</xs:restriction>
 	</xs:simpleType><!-- Protocol -->
 
-	<xs:simpleType name="Seconds">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="3600"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Seconds -->
-
-	<xs:simpleType name="Ipv4_address">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Ipv4_address -->
-
-	<xs:simpleType name="Ipv4_address_prefix">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/[0-9]{1,2}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Ipv4_address_prefix -->
-
 	<xs:element name="config">
 		<xs:complexType>
 			<xs:attribute name="verbose"    type="Boolean" />
diff --git a/repos/os/src/app/trace_logger/config.xsd b/repos/os/src/app/trace_logger/config.xsd
index dbe7bfdaa..0df673acd 100644
--- a/repos/os/src/app/trace_logger/config.xsd
+++ b/repos/os/src/app/trace_logger/config.xsd
@@ -1,36 +1,8 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:simpleType name="Boolean">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="true" />
-			<xs:enumeration value="yes" />
-			<xs:enumeration value="on" />
-			<xs:enumeration value="false" />
-			<xs:enumeration value="no" />
-			<xs:enumeration value="off" />
-		</xs:restriction>
-	</xs:simpleType><!-- Boolean -->
-
-	<xs:simpleType name="Seconds">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="3600"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Seconds -->
-
-	<xs:simpleType name="Number_of_bytes">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Thread_name -->
-
-	<xs:simpleType name="Thread_name">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1"/>
-			<xs:maxLength value="40"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Thread_name -->
+	<xs:include schemaLocation="base_types.xsd"/>
+	<xs:include schemaLocation="timeout_types.xsd"/>
 
 	<xs:simpleType name="Trace_policy_name">
 		<xs:restriction base="xs:string">
@@ -39,13 +11,6 @@
 		</xs:restriction>
 	</xs:simpleType><!-- Trace_policy_name -->
 
-	<xs:simpleType name="Session_label">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1"/>
-			<xs:maxLength value="160"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Session_label -->
-
 	<xs:element name="config">
 		<xs:complexType>
 			<xs:choice minOccurs="0" maxOccurs="unbounded">
diff --git a/repos/os/src/init/config.xsd b/repos/os/src/init/config.xsd
index e5da52ba8..8193d6e3f 100644
--- a/repos/os/src/init/config.xsd
+++ b/repos/os/src/init/config.xsd
@@ -1,28 +1,30 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
+ <xs:include schemaLocation="base_types.xsd"/>
+
  <xs:complexType name="template_service">
   <xs:choice minOccurs="1" maxOccurs="3">
    <xs:element name="parent"/>
    <xs:element name="any-child"/>
    <xs:element name="child">
     <xs:complexType>
-     <xs:attribute name="name" type="xs:string" />
-     <xs:attribute name="label" type="xs:string" />
+     <xs:attribute name="name"  type="xs:string" />
+     <xs:attribute name="label" type="Session_label" />
     </xs:complexType>
    </xs:element>
   </xs:choice>
-  <xs:attribute name="name" type="xs:string" />
-  <xs:attribute name="label" type="xs:string" />
-  <xs:attribute name="label_prefix" type="xs:string" />
-  <xs:attribute name="label_suffix" type="xs:string" />
-  <xs:attribute name="label_last"   type="xs:string" />
-  <xs:attribute name="unscoped_label" type="xs:string" />
+  <xs:attribute name="name"           type="xs:string" />
+  <xs:attribute name="label"          type="Session_label" />
+  <xs:attribute name="label_prefix"   type="Session_label" />
+  <xs:attribute name="label_suffix"   type="Session_label" />
+  <xs:attribute name="label_last"     type="Session_label" />
+  <xs:attribute name="unscoped_label" type="Session_label" />
  </xs:complexType>
 
  <xs:complexType name="template_route">
   <xs:choice minOccurs="0" maxOccurs="unbounded">
-   <xs:element name="service" type="template_service"/>
+   <xs:element name="service"     type="template_service"/>
    <xs:element name="any-service" type="template_service"/>
   </xs:choice>
  </xs:complexType>
@@ -33,7 +35,7 @@
 
     <xs:element name="affinity-space">
      <xs:complexType>
-      <xs:attribute name="width" type="xs:int" />
+      <xs:attribute name="width"  type="xs:int" />
       <xs:attribute name="height" type="xs:int" />
      </xs:complexType>
     </xs:element> <!-- "affinity-space" -->
@@ -52,7 +54,7 @@
 
     <xs:element name="alias">
      <xs:complexType>
-      <xs:attribute name="name" type="xs:string" />
+      <xs:attribute name="name"  type="xs:string" />
       <xs:attribute name="child" type="xs:string" />
      </xs:complexType>
     </xs:element> <!-- "alias" -->
@@ -67,22 +69,22 @@
 
     <xs:element name="report">
      <xs:complexType>
-      <xs:attribute name="ids" type="xs:string" />
-      <xs:attribute name="requested" type="xs:string" />
-      <xs:attribute name="provided" type="xs:string" />
-      <xs:attribute name="session_args" type="xs:string" />
-      <xs:attribute name="child_caps" type="xs:string" />
-      <xs:attribute name="child_ram" type="xs:string" />
-      <xs:attribute name="init_caps" type="xs:string" />
-      <xs:attribute name="init_ram" type="xs:string" />
-      <xs:attribute name="delay_ms" type="xs:int" />
+      <xs:attribute name="ids"          type="Boolean" />
+      <xs:attribute name="requested"    type="Boolean" />
+      <xs:attribute name="provided"     type="Boolean" />
+      <xs:attribute name="session_args" type="Boolean" />
+      <xs:attribute name="child_caps"   type="Boolean" />
+      <xs:attribute name="child_ram"    type="Boolean" />
+      <xs:attribute name="init_caps"    type="Boolean" />
+      <xs:attribute name="init_ram"     type="Boolean" />
+      <xs:attribute name="delay_ms"     type="xs:int" />
      </xs:complexType>
     </xs:element> <!-- "report" -->
 
     <xs:element name="resource">
      <xs:complexType>
-      <xs:attribute name="name" type="xs:string" />
-      <xs:attribute name="preserve" type="xs:string" />
+      <xs:attribute name="name"     type="xs:string" />
+      <xs:attribute name="preserve" type="Number_of_bytes" />
      </xs:complexType>
     </xs:element> <!-- "resource" -->
 
@@ -98,18 +100,18 @@
 
        <xs:element name="affinity">
         <xs:complexType>
-         <xs:attribute name="xpos" type="xs:int" />
-         <xs:attribute name="ypos" type="xs:int" />
-         <xs:attribute name="width" type="xs:int" />
+         <xs:attribute name="xpos"   type="xs:int" />
+         <xs:attribute name="ypos"   type="xs:int" />
+         <xs:attribute name="width"  type="xs:int" />
          <xs:attribute name="height" type="xs:int" />
         </xs:complexType>
        </xs:element> <!-- "affinity" -->
 
        <xs:element name="resource">
         <xs:complexType>
-         <xs:attribute name="name" type="xs:string" />
-         <xs:attribute name="quantum" type="xs:string" />
-         <xs:attribute name="constrain_phys" type="xs:string" />
+         <xs:attribute name="name"           type="xs:string" />
+         <xs:attribute name="quantum"        type="Number_of_bytes" />
+         <xs:attribute name="constrain_phys" type="Boolean" />
         </xs:complexType>
        </xs:element> <!-- "resource" -->
 
@@ -143,17 +145,17 @@
        </xs:element> <!-- "config" -->
 
       </xs:choice>
-      <xs:attribute name="name" type="xs:string" />
-      <xs:attribute name="ld"   type="xs:string" />
-      <xs:attribute name="caps" type="xs:int" />
+      <xs:attribute name="name"     type="xs:string" />
+      <xs:attribute name="ld"       type="Boolean" />
+      <xs:attribute name="caps"     type="xs:int" />
       <xs:attribute name="priority" type="xs:int" />
      </xs:complexType>
     </xs:element> <!-- "start" -->
 
    </xs:choice>
    <xs:attribute name="prio_levels" type="xs:int" />
-   <xs:attribute name="verbose" type="xs:string" />
-   <xs:attribute name="ld_verbose" type="xs:string" />
+   <xs:attribute name="verbose"     type="Boolean" />
+   <xs:attribute name="ld_verbose"  type="Boolean" />
   </xs:complexType>
  </xs:element> <!-- "config" -->
 </xs:schema>
diff --git a/repos/os/src/server/nic_bridge/config.xsd b/repos/os/src/server/nic_bridge/config.xsd
index 9c9bf057a..f13e2f33b 100644
--- a/repos/os/src/server/nic_bridge/config.xsd
+++ b/repos/os/src/server/nic_bridge/config.xsd
@@ -1,35 +1,8 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:simpleType name="Boolean">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="true" />
-			<xs:enumeration value="yes" />
-			<xs:enumeration value="on" />
-			<xs:enumeration value="false" />
-			<xs:enumeration value="no" />
-			<xs:enumeration value="off" />
-		</xs:restriction>
-	</xs:simpleType><!-- Boolean -->
-
-	<xs:simpleType name="Session_label">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1"/>
-			<xs:maxLength value="160"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Session_label -->
-
-	<xs:simpleType name="Ipv4_address">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Ipv4_address -->
-
-	<xs:simpleType name="Mac_address">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Mac_address -->
+	<xs:include schemaLocation="base_types.xsd"/>
+	<xs:include schemaLocation="net_types.xsd"/>
 
 	<xs:element name="config">
 		<xs:complexType>
diff --git a/repos/os/src/server/nic_dump/config.xsd b/repos/os/src/server/nic_dump/config.xsd
index ad0e2aafe..dbfc9083c 100644
--- a/repos/os/src/server/nic_dump/config.xsd
+++ b/repos/os/src/server/nic_dump/config.xsd
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
+	<xs:include schemaLocation="base_types.xsd"/>
+
 	<xs:simpleType name="Interface_label">
 		<xs:restriction base="xs:string">
 			<xs:minLength value="1"/>
@@ -8,17 +10,6 @@
 		</xs:restriction>
 	</xs:simpleType><!-- Interface_label -->
 
-	<xs:simpleType name="Boolean">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="true" />
-			<xs:enumeration value="yes" />
-			<xs:enumeration value="on" />
-			<xs:enumeration value="false" />
-			<xs:enumeration value="no" />
-			<xs:enumeration value="off" />
-		</xs:restriction>
-	</xs:simpleType><!-- Boolean -->
-
 	<xs:simpleType name="Log_style">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="no" />
diff --git a/repos/os/src/server/nic_router/config.xsd b/repos/os/src/server/nic_router/config.xsd
index 5aedd8b47..c71b95916 100644
--- a/repos/os/src/server/nic_router/config.xsd
+++ b/repos/os/src/server/nic_router/config.xsd
@@ -1,37 +1,9 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:simpleType name="Boolean">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="true" />
-			<xs:enumeration value="yes" />
-			<xs:enumeration value="on" />
-			<xs:enumeration value="false" />
-			<xs:enumeration value="no" />
-			<xs:enumeration value="off" />
-		</xs:restriction>
-	</xs:simpleType><!-- Boolean -->
-
-	<xs:simpleType name="Seconds">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="3600"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Seconds -->
-
-	<xs:simpleType name="Port">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="65535"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Port -->
-
-	<xs:simpleType name="Nr_of_ports">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="65536"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Nr_of_ports -->
+	<xs:include schemaLocation="base_types.xsd"/>
+	<xs:include schemaLocation="net_types.xsd"/>
+	<xs:include schemaLocation="timeout_types.xsd"/>
 
 	<xs:simpleType name="Domain_name">
 		<xs:restriction base="xs:string">
@@ -40,24 +12,12 @@
 		</xs:restriction>
 	</xs:simpleType><!-- Domain_name -->
 
-	<xs:simpleType name="Session_label">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1"/>
-			<xs:maxLength value="160"/>
+	<xs:simpleType name="Nr_of_ports">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="1"/>
+			<xs:maxInclusive value="65536"/>
 		</xs:restriction>
-	</xs:simpleType><!-- Session_label -->
-
-	<xs:simpleType name="Ipv4_address">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Ipv4_address -->
-
-	<xs:simpleType name="Ipv4_address_prefix">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/[0-9]{1,2}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Ipv4_address_prefix -->
+	</xs:simpleType><!-- Nr_of_ports -->
 
 	<xs:complexType name="L2_rule">
 		<xs:attribute name="dst"    type="Ipv4_address_prefix" />
diff --git a/repos/os/src/test/net_flood/config.xsd b/repos/os/src/test/net_flood/config.xsd
index e558a9071..95f4b1390 100644
--- a/repos/os/src/test/net_flood/config.xsd
+++ b/repos/os/src/test/net_flood/config.xsd
@@ -1,16 +1,8 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:simpleType name="Boolean">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="true" />
-			<xs:enumeration value="yes" />
-			<xs:enumeration value="on" />
-			<xs:enumeration value="false" />
-			<xs:enumeration value="no" />
-			<xs:enumeration value="off" />
-		</xs:restriction>
-	</xs:simpleType><!-- Boolean -->
+	<xs:include schemaLocation="base_types.xsd"/>
+	<xs:include schemaLocation="net_types.xsd"/>
 
 	<xs:simpleType name="Protocol">
 		<xs:restriction base="xs:string">
@@ -20,18 +12,6 @@
 		</xs:restriction>
 	</xs:simpleType><!-- Protocol -->
 
-	<xs:simpleType name="Ipv4_address">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Ipv4_address -->
-
-	<xs:simpleType name="Ipv4_address_prefix">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/[0-9]{1,2}"/>
-		</xs:restriction>
-	</xs:simpleType><!-- Ipv4_address_prefix -->
-
 	<xs:element name="config">
 		<xs:complexType>
 			<xs:attribute name="verbose"   type="Boolean" />
diff --git a/repos/os/xsd/net_types.xsd b/repos/os/xsd/net_types.xsd
new file mode 100644
index 000000000..7d88cdc28
--- /dev/null
+++ b/repos/os/xsd/net_types.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<xs:simpleType name="Mac_address">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}.[0-9a-fA-F]{2}"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Mac_address -->
+
+	<xs:simpleType name="Ipv4_address">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Ipv4_address -->
+
+	<xs:simpleType name="Ipv4_address_prefix">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/[0-9]{1,2}"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Ipv4_address_prefix -->
+
+	<xs:simpleType name="Port">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="65535"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Port -->
+
+</xs:schema>
diff --git a/repos/os/xsd/timeout_types.xsd b/repos/os/xsd/timeout_types.xsd
new file mode 100644
index 000000000..8adf0fecf
--- /dev/null
+++ b/repos/os/xsd/timeout_types.xsd
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<xs:simpleType name="Seconds">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="1"/>
+			<xs:maxInclusive value="3600"/>
+		</xs:restriction>
+	</xs:simpleType><!-- Seconds -->
+
+</xs:schema>
diff --git a/tool/run/run b/tool/run/run
index 96d5122ea..dd8f84f38 100755
--- a/tool/run/run
+++ b/tool/run/run
@@ -115,7 +115,7 @@ proc check_xml_syntax {xml_file} {
 #                         configurations of children of the component
 # \param nesting_level    level of recursive calls of this procedure
 #
-proc check_config {bin xml_file xsd_file label avail_xsd_files nesting_level} {
+proc check_config {bin xml_file xsd_file label avail_xsd_files xsd_inc nesting_level} {
 
 	# check prerequisites if this is not a recursive call
 	if {$nesting_level == 0} {
@@ -130,7 +130,7 @@ proc check_config {bin xml_file xsd_file label avail_xsd_files nesting_level} {
 
 	# check the given component configuration itself
 	puts "  CHECK $label"
-	if {[catch {exec xmllint --noout -schema $xsd_file $xml_file} result]} {
+	if {[catch {exec xmllint --noout --path $xsd_inc -schema $xsd_file $xml_file} result]} {
 
 		if {$result != "$xml_file validates"} {
 
@@ -199,7 +199,8 @@ proc check_config {bin xml_file xsd_file label avail_xsd_files nesting_level} {
 			# call this procedure again on the child config file
 			set child_label "$label -> $child_name"
 			check_config $child_bin $child_xml_file $child_xsd_file \
-			             $child_label $avail_xsd_files [expr $nesting_level+1]
+			             $child_label $avail_xsd_files $xsd_inc \
+			             [expr $nesting_level+1]
 
 			# clean up
 			exec rm -f $child_xml_file
@@ -246,9 +247,16 @@ proc build_boot_image {binaries} {
 			set init_xsd_file $xsd_file
 		}
 	}
+	# determine include directories that can be used by the XSD files
+	global repositories;
+	set xsd_inc ""
+	foreach repo $repositories {
+		if {[file exists $repo/xsd]} {
+			append xsd_inc "$repo/xsd " }
+	}
 	# check configurations of init and its children
 	puts "checking configuration syntax"
-	check_config init [run_dir]/genode/config $init_xsd_file init $xsd_files 0
+	check_config init [run_dir]/genode/config $init_xsd_file init $xsd_files $xsd_inc 0
 
 	run_boot_dir $binaries
 }