From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 6 Jan 2021 10:50:56 +0000 (+0100)
Subject: schema: Fix TPM version rules
X-Git-Tag: v7.0.0-rc1~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ae6f5e10e38242c2196a792c3e645725e95dfcf;p=thirdparty%2Flibvirt.git

schema: Fix TPM version rules

According to our parser (virDomainTPMDefParseXML()) the version
is an optional attribute and independent of TPM backend type.
Therefore, it's not a choice group, which is what our RNG schema
suggests.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 712fb60562..86816e9b1d 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4776,18 +4776,14 @@
           </optional>
         </group>
       </choice>
-      <choice>
-        <group>
-          <optional>
-            <attribute name="version">
-              <choice>
-                <value>1.2</value>
-                <value>2.0</value>
-              </choice>
-           </attribute>
-          </optional>
-        </group>
-      </choice>
+      <optional>
+        <attribute name="version">
+          <choice>
+            <value>1.2</value>
+            <value>2.0</value>
+          </choice>
+       </attribute>
+      </optional>
     </element>
   </define>