The name "pflashFormatTypes" was already inaccurate, since the
format attribute applies to ROM loaders too.

Additionally, we are soon going to introduce support for formats
that can be used for NVRAMs and their templates but not for the
corresponding executables, so we need two distinct lists despite
the partial overlap.

Signed-off-by: Andrea Bolognani <[email protected]>
---
 src/conf/schemas/domaincommon.rng | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/conf/schemas/domaincommon.rng 
b/src/conf/schemas/domaincommon.rng
index 400e7eec22..c799bf04b7 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -342,7 +342,7 @@
               </optional>
               <optional>
                 <attribute name="format">
-                  <ref name="pflashFormatTypes"/>
+                  <ref name="firmwareLoaderFormats"/>
                 </attribute>
               </optional>
               <optional>
@@ -359,12 +359,12 @@
               </optional>
               <optional>
                 <attribute name="templateFormat">
-                  <ref name="pflashFormatTypes"/>
+                  <ref name="firmwareNvramFormats"/>
                 </attribute>
               </optional>
               <optional>
                 <attribute name="format">
-                  <ref name="pflashFormatTypes"/>
+                  <ref name="firmwareNvramFormats"/>
                 </attribute>
               </optional>
               <optional>
@@ -8024,7 +8024,14 @@
     </element>
   </define>
 
-  <define name="pflashFormatTypes">
+  <define name="firmwareLoaderFormats">
+    <choice>
+      <value>raw</value>
+      <value>qcow2</value>
+    </choice>
+  </define>
+
+  <define name="firmwareNvramFormats">
     <choice>
       <value>raw</value>
       <value>qcow2</value>
-- 
2.52.0

Reply via email to