File b494e09d-schema-driver-name-optional.patch of Package libvirt.8364

Overview Repositories Revisions Requests Users Attributes Meta

File b494e09d-schema-driver-name-optional.patch of Package libvirt.8364

commit b494e09d058f09b48d0fd8855edd557101294671
Author: Jim Fehlig <jfehlig@suse.com>
Date:   Tue Jul 18 10:20:35 2017 -0600

docs: schema: make disk driver name attribute optional
    
    /domain/devices/disk/driver/@name is not a required or mandatory
    attribute according to formatdomain, and indeed it was agreed on
    IRC that the attribute is "optional for input, recommended (but
    not required) for output". Currently the schema requires the
    attribute, causing virt-xml-validate to fail on disk config where
    the driver name is not explicitly specified. E.g.
    
    # cat test.xml | grep -A 5 cdrom
        <disk type='file' device='cdrom'>
          <driver type='raw'/>
          <target dev='hdb' bus='ide'/>
          <readonly/>
          <address type='drive' controller='0' bus='0' target='0' unit='1'/>
        </disk>
    
    # virt-xml-validate test.xml
    Relax-NG validity error : Extra element devices in interleave
    test.xml:21: element devices: Relax-NG validity error : Element domain failed to validate content
    test.xml fails to validate
    
    Relaxing the name attribute to be optional fixes the validation
    
    # virt-xml-validate test.xml
    test.xml validates

Index: libvirt-2.0.0/docs/schemas/domaincommon.rng
===================================================================
--- libvirt-2.0.0.orig/docs/schemas/domaincommon.rng
+++ libvirt-2.0.0/docs/schemas/domaincommon.rng
@@ -1627,9 +1627,11 @@
     </element>
   </define>
   <define name="driverFormat">
-    <attribute name="name">
-      <ref name="genericName"/>
-    </attribute>
+    <optional>
+      <attribute name="name">
+        <ref name="genericName"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name='type'>
         <choice>

Places

File b494e09d-schema-driver-name-optional.patch of Package libvirt.8364

Places