From b025718b52edd0dd0f90ef24992ade788381ae76 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 25 Aug 2022 11:20:50 +0200
Subject: [PATCH] schemas: Extract overrides for the domain element from
 'domain.rng'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the overrides into a single file so that later patches can add
another top level element 'inactiveDomain' used in snapshots.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/conf/schemas/domain.rng          | 12 +-----------
 src/conf/schemas/domainoverrides.rng | 16 ++++++++++++++++
 src/conf/schemas/meson.build         |  1 +
 3 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 src/conf/schemas/domainoverrides.rng

diff --git a/src/conf/schemas/domain.rng b/src/conf/schemas/domain.rng
index b93bbed959..adc4386a27 100644
--- a/src/conf/schemas/domain.rng
+++ b/src/conf/schemas/domain.rng
@@ -6,16 +6,6 @@
     <ref name="domain"/>
   </start>
 
-  <include href="domaincommon.rng"/>
-
-  <define name="storageStartupPolicy" combine="choice">
-    <!-- overrides the no-op version in storagecommon.rng -->
-    <ref name="startupPolicy"/>
-  </define>
-
-  <define name="storageSourceExtra" combine="choice">
-    <!-- overrides the no-op version in storagecommon.rng -->
-    <ref name="diskspec"/>
-  </define>
+  <include href="domainoverrides.rng"/>
 
 </grammar>
diff --git a/src/conf/schemas/domainoverrides.rng b/src/conf/schemas/domainoverrides.rng
new file mode 100644
index 0000000000..13b18a28ea
--- /dev/null
+++ b/src/conf/schemas/domainoverrides.rng
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!-- Overrides for the no-op versions of storage elements for use with domain XMLs. -->
+  <include href="domaincommon.rng"/>
+
+  <define name="storageStartupPolicy" combine="choice">
+    <!-- overrides the no-op version in storagecommon.rng -->
+    <ref name="startupPolicy"/>
+  </define>
+
+  <define name="storageSourceExtra" combine="choice">
+    <!-- overrides the no-op version in storagecommon.rng -->
+    <ref name="diskspec"/>
+  </define>
+
+</grammar>
diff --git a/src/conf/schemas/meson.build b/src/conf/schemas/meson.build
index 700161bf75..1bb09b4c5d 100644
--- a/src/conf/schemas/meson.build
+++ b/src/conf/schemas/meson.build
@@ -8,6 +8,7 @@ schema_files = [
   'domaincheckpoint.rng',
   'domaincommon.rng',
   'domain.rng',
+  'domainoverrides.rng',
   'domainsnapshot.rng',
   'interface.rng',
   'networkcommon.rng',