From: Boris Fiuczynski <fiuczy@linux.ibm.com>
Date: Fri, 23 Oct 2020 17:31:50 +0000 (+0200)
Subject: schema: refactor mdev_types out of PCI nodedev schema
X-Git-Tag: v6.10.0-rc1~333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5f8c358a33721cfe33d59c69565c616c27f9265;p=thirdparty%2Flibvirt.git

schema: refactor mdev_types out of PCI nodedev schema

Refactor mdev_types into standalone define for later reuse.

Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
index 0456ddbe93..231afa0218 100644
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -216,27 +216,7 @@
     </optional>
 
     <optional>
-      <element name="capability">
-        <attribute name="type">
-          <value>mdev_types</value>
-        </attribute>
-        <oneOrMore>
-          <element name="type">
-            <attribute name="id">
-              <data type="string"/>
-            </attribute>
-            <optional>
-              <element name="name"><text/></element>
-            </optional>
-            <element name="deviceAPI">
-              <value>vfio-pci</value>
-            </element>
-            <element name="availableInstances">
-              <ref name="unsignedInt"/>
-            </element>
-          </element>
-        </oneOrMore>
-      </element>
+      <ref name="mdev_types"/>
     </optional>
 
     <optional>
@@ -706,4 +686,30 @@
     </data>
   </define>
 
+  <define name="mdev_types">
+    <element name="capability">
+      <attribute name="type">
+        <value>mdev_types</value>
+      </attribute>
+      <oneOrMore>
+        <element name="type">
+          <attribute name="id">
+            <data type="string"/>
+          </attribute>
+          <optional>
+            <element name="name"><text/></element>
+          </optional>
+          <element name="deviceAPI">
+            <choice>
+              <value>vfio-pci</value>
+            </choice>
+          </element>
+          <element name="availableInstances">
+            <ref name="unsignedInt"/>
+          </element>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
+
 </grammar>