schema: Unify apostrophe and quotation mark usage

Quotation marks were used ~ 7000 times, apostrophes ~ 3000 times.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Tim Wiederhake 2020-09-30 13:54:58 +02:00 committed by Peter Krempa
parent 3fdb431718
commit 0e907b8216
21 changed files with 1538 additions and 1538 deletions

View File

@ -8,14 +8,14 @@
<param name="pattern">[0-9]+</param>
</data>
</define>
<define name='unsignedLong'>
<data type='unsignedLong'>
<param name='pattern'>[0-9]+</param>
<define name="unsignedLong">
<data type="unsignedLong">
<param name="pattern">[0-9]+</param>
</data>
</define>
<define name='hexuint'>
<data type='string'>
<define name="hexuint">
<data type="string">
<param name="pattern">(0x)?[0-9a-f]+</param>
</data>
</define>
@ -26,9 +26,9 @@
</data>
</define>
<define name='octalMode'>
<define name="octalMode">
<data type="unsignedInt">
<param name='pattern'>[0-7]+</param>
<param name="pattern">[0-7]+</param>
</data>
</define>
@ -48,7 +48,7 @@
<data type="string">
<param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param>
</data>
<data type='int'>
<data type="int">
<param name="minInclusive">0</param>
<param name="maxInclusive">65535</param>
</data>
@ -309,18 +309,18 @@
</data>
</define>
<define name='unit'>
<data type='string'>
<param name='pattern'>([bB]([yY][tT][eE][sS]?)?)|([kKmMgGtTpPeE]([iI]?[bB])?)</param>
<define name="unit">
<data type="string">
<param name="pattern">([bB]([yY][tT][eE][sS]?)?)|([kKmMgGtTpPeE]([iI]?[bB])?)</param>
</data>
</define>
<define name='scaledInteger'>
<define name="scaledInteger">
<optional>
<attribute name='unit'>
<ref name='unit'/>
<attribute name="unit">
<ref name="unit"/>
</attribute>
</optional>
<ref name='unsignedLong'/>
<ref name="unsignedLong"/>
</define>
<define name="pciDomain">
@ -352,9 +352,9 @@
</choice>
</define>
<define name='wwn'>
<data type='string'>
<param name='pattern'>(0x)?[0-9a-fA-F]{16}</param>
<define name="wwn">
<data type="string">
<param name="pattern">(0x)?[0-9a-fA-F]{16}</param>
</data>
</define>
@ -395,9 +395,9 @@
</data>
</define>
<define name='volName'>
<define name="volName">
<!-- directory pools allow almost any file name as a volume name -->
<data type='string'>
<data type="string">
<param name="pattern">[^/]+</param>
<except>
<choice>
@ -408,7 +408,7 @@
</data>
</define>
<define name='archnames'>
<define name="archnames">
<choice>
<value>aarch64</value>
<value>alpha</value>
@ -454,20 +454,20 @@
</data>
</define>
<define name='sourceinfoadapter'>
<element name='adapter'>
<define name="sourceinfoadapter">
<element name="adapter">
<choice>
<group>
<!-- To keep back-compat, 'type' is not mandatory for
<!-- To keep back-compat, "type" is not mandatory for
scsi_host adapter -->
<optional>
<attribute name='type'>
<attribute name="type">
<value>scsi_host</value>
</attribute>
</optional>
<choice>
<group>
<attribute name='name'>
<attribute name="name">
<text/>
</attribute>
</group>
@ -475,8 +475,8 @@
<interleave>
<element name="parentaddr">
<optional>
<attribute name='unique_id'>
<ref name='positiveInteger'/>
<attribute name="unique_id">
<ref name="positiveInteger"/>
</attribute>
</optional>
<element name="address">
@ -488,39 +488,39 @@
</choice>
</group>
<group>
<attribute name='type'>
<attribute name="type">
<value>fc_host</value>
</attribute>
<optional>
<attribute name='parent'>
<attribute name="parent">
<text/>
</attribute>
</optional>
<optional>
<attribute name='managed'>
<attribute name="managed">
<ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<attribute name='parent_wwnn'>
<ref name='wwn'/>
<attribute name="parent_wwnn">
<ref name="wwn"/>
</attribute>
</optional>
<optional>
<attribute name='parent_wwpn'>
<ref name='wwn'/>
<attribute name="parent_wwpn">
<ref name="wwn"/>
</attribute>
</optional>
<optional>
<attribute name='parent_fabric_wwn'>
<ref name='wwn'/>
<attribute name="parent_fabric_wwn">
<ref name="wwn"/>
</attribute>
</optional>
<attribute name='wwnn'>
<ref name='wwn'/>
<attribute name="wwnn">
<ref name="wwn"/>
</attribute>
<attribute name='wwpn'>
<ref name='wwn'/>
<attribute name="wwpn">
<ref name="wwn"/>
</attribute>
</group>
</choice>

View File

@ -2,76 +2,76 @@
<!-- A Relax NG schema for the libvirt capabilities XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href='basictypes.rng'/>
<include href="basictypes.rng"/>
<start>
<ref name='capabilities'/>
<ref name="capabilities"/>
</start>
<define name='capabilities'>
<element name='capabilities'>
<ref name='hostcaps'/>
<define name="capabilities">
<element name="capabilities">
<ref name="hostcaps"/>
<zeroOrMore>
<ref name='guestcaps'/>
<ref name="guestcaps"/>
</zeroOrMore>
</element>
</define>
<define name='hostcaps'>
<element name='host'>
<define name="hostcaps">
<element name="host">
<optional>
<element name='uuid'>
<ref name='UUID'/>
<element name="uuid">
<ref name="UUID"/>
</element>
</optional>
<element name='cpu'>
<element name='arch'>
<ref name='archnames'/>
<element name="cpu">
<element name="arch">
<ref name="archnames"/>
</element>
<optional>
<ref name='cpufeatures'/>
<ref name="cpufeatures"/>
</optional>
<optional>
<ref name='cpuspec'/>
<ref name="cpuspec"/>
</optional>
</element>
<optional>
<ref name='power_management'/>
<ref name="power_management"/>
</optional>
<optional>
<ref name='iommu_support'/>
<ref name="iommu_support"/>
</optional>
<optional>
<ref name='migration'/>
<ref name="migration"/>
</optional>
<optional>
<ref name='topology'/>
<ref name="topology"/>
</optional>
<optional>
<ref name='cache'/>
<ref name="cache"/>
</optional>
<optional>
<ref name='memory_bandwidth'/>
<ref name="memory_bandwidth"/>
</optional>
<zeroOrMore>
<ref name='secmodel'/>
<ref name="secmodel"/>
</zeroOrMore>
</element>
</define>
<define name='secmodel'>
<element name='secmodel'>
<define name="secmodel">
<element name="secmodel">
<interleave>
<element name='model'>
<element name="model">
<text/>
</element>
<element name='doi'>
<element name="doi">
<text/>
</element>
<zeroOrMore>
<element name='baselabel'>
<attribute name='type'>
<element name="baselabel">
<attribute name="type">
<text/>
</attribute>
<text/>
@ -82,78 +82,78 @@
</define>
<define name='cpufeatures'>
<element name='features'>
<define name="cpufeatures">
<element name="features">
<optional>
<element name='pae'><empty/></element>
<element name="pae"><empty/></element>
</optional>
<optional>
<element name='nonpae'><empty/></element>
<element name="nonpae"><empty/></element>
</optional>
<optional>
<element name='vmx'><empty/></element>
<element name="vmx"><empty/></element>
</optional>
<optional>
<element name='svm'><empty/></element>
<element name="svm"><empty/></element>
</optional>
</element>
</define>
<define name='cpuspec'>
<element name='model'>
<define name="cpuspec">
<element name="model">
<text/>
</element>
<optional>
<element name='vendor'>
<element name="vendor">
<text/>
</element>
</optional>
<optional>
<element name='microcode'>
<attribute name='version'>
<ref name='positiveInteger'/>
<element name="microcode">
<attribute name="version">
<ref name="positiveInteger"/>
</attribute>
</element>
</optional>
<element name='topology'>
<attribute name='sockets'>
<ref name='positiveInteger'/>
<element name="topology">
<attribute name="sockets">
<ref name="positiveInteger"/>
</attribute>
<attribute name='cores'>
<ref name='positiveInteger'/>
<attribute name="cores">
<ref name="positiveInteger"/>
</attribute>
<attribute name='threads'>
<ref name='positiveInteger'/>
<attribute name="threads">
<ref name="positiveInteger"/>
</attribute>
</element>
<zeroOrMore>
<element name='feature'>
<attribute name='name'>
<ref name='featureName'/>
<element name="feature">
<attribute name="name">
<ref name="featureName"/>
</attribute>
<empty/>
</element>
</zeroOrMore>
<zeroOrMore>
<ref name='pagesHost'/>
<ref name="pagesHost"/>
</zeroOrMore>
</define>
<define name='power_management'>
<element name='power_management'>
<define name="power_management">
<element name="power_management">
<interleave>
<optional>
<element name='suspend_mem'>
<element name="suspend_mem">
<empty/>
</element>
</optional>
<optional>
<element name='suspend_disk'>
<element name="suspend_disk">
<empty/>
</element>
</optional>
<optional>
<element name='suspend_hybrid'>
<element name="suspend_hybrid">
<empty/>
</element>
</optional>
@ -161,27 +161,27 @@
</element>
</define>
<define name='iommu_support'>
<element name='iommu'>
<define name="iommu_support">
<element name="iommu">
<optional>
<attribute name='support'>
<ref name='virYesNo'/>
<attribute name="support">
<ref name="virYesNo"/>
</attribute>
</optional>
</element>
</define>
<define name='migration'>
<element name='migration_features'>
<define name="migration">
<element name="migration_features">
<optional>
<element name='live'>
<element name="live">
<empty/>
</element>
</optional>
<optional>
<element name='uri_transports'>
<element name="uri_transports">
<oneOrMore>
<element name='uri_transport'>
<element name="uri_transport">
<choice>
<value>vpxmigr</value>
<value>tcp</value>
@ -195,42 +195,42 @@
</element>
</define>
<define name='topology'>
<element name='topology'>
<element name='cells'>
<attribute name='num'>
<ref name='unsignedInt'/>
<define name="topology">
<element name="topology">
<element name="cells">
<attribute name="num">
<ref name="unsignedInt"/>
</attribute>
<oneOrMore>
<ref name='cell'/>
<ref name="cell"/>
</oneOrMore>
</element>
</element>
</define>
<define name='cell'>
<element name='cell'>
<attribute name='id'>
<ref name='unsignedInt'/>
<define name="cell">
<element name="cell">
<attribute name="id">
<ref name="unsignedInt"/>
</attribute>
<optional>
<ref name='memory'/>
<ref name="memory"/>
</optional>
<zeroOrMore>
<ref name='pagesNuma'/>
<ref name="pagesNuma"/>
</zeroOrMore>
<optional>
<element name='distances'>
<element name="distances">
<zeroOrMore>
<element name='sibling'>
<attribute name='id'>
<ref name='unsignedInt'/>
<element name="sibling">
<attribute name="id">
<ref name="unsignedInt"/>
</attribute>
<attribute name='value'>
<ref name='unsignedInt'/>
<attribute name="value">
<ref name="unsignedInt"/>
</attribute>
</element>
</zeroOrMore>
@ -238,95 +238,95 @@
</optional>
<optional>
<element name='cpus'>
<attribute name='num'>
<ref name='unsignedInt'/>
<element name="cpus">
<attribute name="num">
<ref name="unsignedInt"/>
</attribute>
<oneOrMore>
<ref name='cpu'/>
<ref name="cpu"/>
</oneOrMore>
</element>
</optional>
</element>
</define>
<define name='memory'>
<element name='memory'>
<ref name='scaledInteger'/>
<define name="memory">
<element name="memory">
<ref name="scaledInteger"/>
</element>
</define>
<define name='cpu'>
<element name='cpu'>
<attribute name='id'>
<ref name='unsignedInt'/>
<define name="cpu">
<element name="cpu">
<attribute name="id">
<ref name="unsignedInt"/>
</attribute>
<optional>
<attribute name='socket_id'>
<ref name='unsignedInt'/>
<attribute name="socket_id">
<ref name="unsignedInt"/>
</attribute>
<attribute name='die_id'>
<ref name='unsignedInt'/>
<attribute name="die_id">
<ref name="unsignedInt"/>
</attribute>
<attribute name='core_id'>
<ref name='unsignedInt'/>
<attribute name="core_id">
<ref name="unsignedInt"/>
</attribute>
<attribute name='siblings'>
<ref name='cpuset'/>
<attribute name="siblings">
<ref name="cpuset"/>
</attribute>
</optional>
</element>
</define>
<define name='cache'>
<element name='cache'>
<define name="cache">
<element name="cache">
<oneOrMore>
<element name='bank'>
<attribute name='id'>
<ref name='unsignedInt'/>
<element name="bank">
<attribute name="id">
<ref name="unsignedInt"/>
</attribute>
<attribute name='level'>
<ref name='unsignedInt'/>
<attribute name="level">
<ref name="unsignedInt"/>
</attribute>
<ref name='cacheType'/>
<attribute name='size'>
<ref name='unsignedInt'/>
<ref name="cacheType"/>
<attribute name="size">
<ref name="unsignedInt"/>
</attribute>
<attribute name='unit'>
<ref name='unit'/>
<attribute name="unit">
<ref name="unit"/>
</attribute>
<attribute name='cpus'>
<ref name='cpuset'/>
<attribute name="cpus">
<ref name="cpuset"/>
</attribute>
<zeroOrMore>
<element name='control'>
<attribute name='granularity'>
<ref name='unsignedInt'/>
<element name="control">
<attribute name="granularity">
<ref name="unsignedInt"/>
</attribute>
<optional>
<attribute name='min'>
<ref name='unsignedInt'/>
<attribute name="min">
<ref name="unsignedInt"/>
</attribute>
</optional>
<attribute name='unit'>
<ref name='unit'/>
<attribute name="unit">
<ref name="unit"/>
</attribute>
<ref name='cacheType'/>
<attribute name='maxAllocs'>
<ref name='unsignedInt'/>
<ref name="cacheType"/>
<attribute name="maxAllocs">
<ref name="unsignedInt"/>
</attribute>
</element>
</zeroOrMore>
</element>
</oneOrMore>
<optional>
<ref name='cpuMonitor'/>
<ref name="cpuMonitor"/>
</optional>
</element>
</define>
<define name='cacheType'>
<attribute name='type'>
<define name="cacheType">
<attribute name="type">
<choice>
<value>both</value>
<value>code</value>
@ -335,83 +335,83 @@
</attribute>
</define>
<define name='memory_bandwidth'>
<element name='memory_bandwidth'>
<define name="memory_bandwidth">
<element name="memory_bandwidth">
<oneOrMore>
<element name='node'>
<attribute name='id'>
<ref name='unsignedInt'/>
<element name="node">
<attribute name="id">
<ref name="unsignedInt"/>
</attribute>
<attribute name='cpus'>
<ref name='cpuset'/>
<attribute name="cpus">
<ref name="cpuset"/>
</attribute>
<zeroOrMore>
<element name='control'>
<attribute name='granularity'>
<ref name='unsignedInt'/>
<element name="control">
<attribute name="granularity">
<ref name="unsignedInt"/>
</attribute>
<optional>
<attribute name='min'>
<ref name='unsignedInt'/>
<attribute name="min">
<ref name="unsignedInt"/>
</attribute>
</optional>
<attribute name='maxAllocs'>
<ref name='unsignedInt'/>
<attribute name="maxAllocs">
<ref name="unsignedInt"/>
</attribute>
</element>
</zeroOrMore>
</element>
</oneOrMore>
<optional>
<ref name='cpuMonitor'/>
<ref name="cpuMonitor"/>
</optional>
</element>
</define>
<define name='cpuMonitor'>
<element name='monitor'>
<define name="cpuMonitor">
<element name="monitor">
<optional>
<attribute name='level'>
<ref name='unsignedInt'/>
<attribute name="level">
<ref name="unsignedInt"/>
</attribute>
<attribute name='reuseThreshold'>
<ref name='unsignedInt'/>
<attribute name="reuseThreshold">
<ref name="unsignedInt"/>
</attribute>
</optional>
<attribute name='maxMonitors'>
<ref name='unsignedInt'/>
<attribute name="maxMonitors">
<ref name="unsignedInt"/>
</attribute>
<oneOrMore>
<element name='feature'>
<attribute name='name'>
<ref name='monitorFeature'/>
<element name="feature">
<attribute name="name">
<ref name="monitorFeature"/>
</attribute>
</element>
</oneOrMore>
</element>
</define>
<define name='monitorFeature'>
<data type='string'>
<param name='pattern'>(llc_|mbm_)[a-zA-Z0-9\-_]+</param>
<define name="monitorFeature">
<data type="string">
<param name="pattern">(llc_|mbm_)[a-zA-Z0-9\-_]+</param>
</data>
</define>
<define name='guestcaps'>
<element name='guest'>
<ref name='ostype'/>
<ref name='arch'/>
<define name="guestcaps">
<element name="guest">
<ref name="ostype"/>
<ref name="arch"/>
<optional>
<ref name='features'/>
<ref name="features"/>
</optional>
</element>
</define>
<define name='ostype'>
<element name='os_type'>
<define name="ostype">
<element name="os_type">
<choice>
<value>xen</value> <!-- Xen 3.0 pv -->
<value>linux</value> <!-- same as 'xen' - meant to be legacy -->
<value>linux</value> <!-- same as "xen" - meant to be legacy -->
<value>hvm</value> <!-- unmodified OS -->
<value>exe</value> <!-- For container based virt -->
<value>uml</value> <!-- user mode linux; NOT USED ANYMORE -->
@ -419,41 +419,41 @@
</element>
</define>
<define name='arch'>
<element name='arch'>
<attribute name='name'>
<ref name='archnames'/>
<define name="arch">
<element name="arch">
<attribute name="name">
<ref name="archnames"/>
</attribute>
<ref name='wordsize'/>
<ref name="wordsize"/>
<optional>
<ref name='emulator'/>
<ref name="emulator"/>
</optional>
<optional>
<ref name='loader'/>
<ref name="loader"/>
</optional>
<zeroOrMore>
<ref name='machine'/>
<ref name="machine"/>
</zeroOrMore>
<oneOrMore>
<ref name='domain'/>
<ref name="domain"/>
</oneOrMore>
</element>
</define>
<define name='emulator'>
<element name='emulator'>
<ref name='absFilePath'/>
<define name="emulator">
<element name="emulator">
<ref name="absFilePath"/>
</element>
</define>
<define name='loader'>
<element name='loader'>
<ref name='absFilePath'/>
<define name="loader">
<element name="loader">
<ref name="absFilePath"/>
</element>
</define>
<define name='wordsize'>
<element name='wordsize'>
<define name="wordsize">
<element name="wordsize">
<choice>
<value>31</value>
<value>32</value>
@ -462,25 +462,25 @@
</element>
</define>
<define name='machine'>
<element name='machine'>
<define name="machine">
<element name="machine">
<optional>
<attribute name='canonical'>
<attribute name="canonical">
<text/>
</attribute>
</optional>
<optional>
<attribute name='maxCpus'>
<ref name='unsignedInt'/>
<attribute name="maxCpus">
<ref name="unsignedInt"/>
</attribute>
</optional>
<text/>
</element>
</define>
<define name='domain'>
<element name='domain'>
<attribute name='type'>
<define name="domain">
<element name="domain">
<attribute name="type">
<choice>
<value>qemu</value>
<value>kqemu</value>
@ -494,63 +494,63 @@
</attribute>
<optional>
<ref name='emulator'/>
<ref name="emulator"/>
</optional>
<zeroOrMore>
<ref name='machine'/>
<ref name="machine"/>
</zeroOrMore>
</element>
</define>
<define name='features'>
<element name='features'>
<define name="features">
<element name="features">
<interleave>
<optional>
<element name='pae'>
<element name="pae">
<empty/>
</element>
</optional>
<optional>
<element name='nonpae'>
<element name="nonpae">
<empty/>
</element>
</optional>
<optional>
<element name='ia64_be'>
<element name="ia64_be">
<empty/>
</element>
</optional>
<optional>
<element name='acpi'>
<ref name='featuretoggle'/>
<element name="acpi">
<ref name="featuretoggle"/>
<empty/>
</element>
</optional>
<optional>
<element name='apic'>
<ref name='featuretoggle'/>
<element name="apic">
<ref name="featuretoggle"/>
<empty/>
</element>
</optional>
<optional>
<element name='cpuselection'>
<element name="cpuselection">
<empty/>
</element>
</optional>
<optional>
<element name='deviceboot'>
<element name="deviceboot">
<empty/>
</element>
</optional>
<optional>
<element name='disksnapshot'>
<ref name='featuretoggle'/>
<element name="disksnapshot">
<ref name="featuretoggle"/>
<empty/>
</element>
</optional>
<optional>
<element name='hap'>
<ref name='featuretoggle'/>
<element name="hap">
<ref name="featuretoggle"/>
<empty/>
</element>
</optional>
@ -558,40 +558,40 @@
</element>
</define>
<define name='featuretoggle'>
<attribute name='toggle'>
<define name="featuretoggle">
<attribute name="toggle">
<ref name="virYesNo"/>
</attribute>
<attribute name='default'>
<attribute name="default">
<ref name="virOnOff"/>
</attribute>
</define>
<define name='featureName'>
<data type='string'>
<param name='pattern'>[a-zA-Z0-9\-_]+</param>
<define name="featureName">
<data type="string">
<param name="pattern">[a-zA-Z0-9\-_]+</param>
</data>
</define>
<define name='pagesHost'>
<element name='pages'>
<ref name='pagesElem'/>
<define name="pagesHost">
<element name="pages">
<ref name="pagesElem"/>
</element>
</define>
<define name='pagesNuma'>
<element name='pages'>
<ref name='pagesElem'/>
<ref name='unsignedInt'/>
<define name="pagesNuma">
<element name="pages">
<ref name="pagesElem"/>
<ref name="unsignedInt"/>
</element>
</define>
<define name='pagesElem'>
<define name="pagesElem">
<optional>
<attribute name='unit'>
<ref name='unit'/>
<attribute name="unit">
<ref name="unit"/>
</attribute>
</optional>
<attribute name='size'>
<ref name='unsignedInt'/>
<attribute name="size">
<ref name="unsignedInt"/>
</attribute>
</define>
</grammar>

View File

@ -46,7 +46,7 @@
<optional>
<attribute name="vendor_id">
<data type="string">
<param name='pattern'>[^,]{12}</param>
<param name="pattern">[^,]{12}</param>
</data>
</attribute>
</optional>
@ -274,7 +274,7 @@
</define>
<define name="featureName">
<data type="string">
<param name='pattern'>[a-zA-Z0-9\-_\.]+</param>
<param name="pattern">[a-zA-Z0-9\-_\.]+</param>
</data>
</define>

View File

@ -6,16 +6,16 @@
<ref name="domain"/>
</start>
<include href='domaincommon.rng'/>
<include href="domaincommon.rng"/>
<define name='storageStartupPolicy' combine='choice'>
<define name="storageStartupPolicy" combine="choice">
<!-- overrides the no-op version in storagecommon.rng -->
<ref name='startupPolicy'/>
<ref name="startupPolicy"/>
</define>
<define name='storageSourceExtra' combine='choice'>
<define name="storageSourceExtra" combine="choice">
<!-- overrides the no-op version in storagecommon.rng -->
<ref name='diskspec'/>
<ref name="diskspec"/>
</define>
</grammar>

View File

@ -2,57 +2,57 @@
<!-- A Relax NG schema for the libvirt domain backup properties XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<start>
<ref name='domainbackup'/>
<ref name="domainbackup"/>
</start>
<include href='domaincommon.rng'/>
<include href="domaincommon.rng"/>
<define name='backupEncryption'>
<element name='encryption'>
<attribute name='format'>
<define name="backupEncryption">
<element name="encryption">
<attribute name="format">
<choice>
<value>luks</value>
</choice>
</attribute>
<interleave>
<ref name='secret'/>
<ref name="secret"/>
<optional>
<element name='cipher'>
<ref name='keycipher'/>
<element name="cipher">
<ref name="keycipher"/>
</element>
<element name='ivgen'>
<ref name='keyivgen'/>
<element name="ivgen">
<ref name="keyivgen"/>
</element>
</optional>
</interleave>
</element>
</define>
<define name='domainbackup'>
<element name='domainbackup'>
<define name="domainbackup">
<element name="domainbackup">
<interleave>
<optional>
<element name='incremental'>
<element name="incremental">
<text/>
</element>
</optional>
<choice>
<group>
<optional>
<attribute name='mode'>
<attribute name="mode">
<value>push</value>
</attribute>
</optional>
<ref name='backupDisksPush'/>
<ref name="backupDisksPush"/>
</group>
<group>
<attribute name='mode'>
<attribute name="mode">
<value>pull</value>
</attribute>
<interleave>
<element name='server'>
<element name="server">
<optional>
<attribute name='tls'>
<attribute name="tls">
<choice>
<value>yes</value>
<value>no</value>
@ -62,33 +62,33 @@
<choice>
<group>
<optional>
<attribute name='transport'>
<attribute name="transport">
<value>tcp</value>
</attribute>
</optional>
<attribute name='name'>
<attribute name="name">
<choice>
<ref name='dnsName'/>
<ref name='ipAddr'/>
<ref name="dnsName"/>
<ref name="ipAddr"/>
</choice>
</attribute>
<optional>
<attribute name='port'>
<ref name='unsignedInt'/>
<attribute name="port">
<ref name="unsignedInt"/>
</attribute>
</optional>
</group>
<group>
<attribute name='transport'>
<attribute name="transport">
<value>unix</value>
</attribute>
<attribute name='socket'>
<ref name='absFilePath'/>
<attribute name="socket">
<ref name="absFilePath"/>
</attribute>
</group>
</choice>
</element>
<ref name='backupDisksPull'/>
<ref name="backupDisksPull"/>
</interleave>
</group>
</choice>
@ -97,49 +97,49 @@
</define>
<define name='backupDiskMode'>
<define name="backupDiskMode">
<optional>
<choice>
<attribute name='backupmode'>
<attribute name="backupmode">
<value>full</value>
</attribute>
<group>
<optional>
<attribute name='backupmode'>
<attribute name="backupmode">
<value>incremental</value>
</attribute>
</optional>
<optional>
<attribute name='incremental'/>
<attribute name="incremental"/>
</optional>
</group>
</choice>
</optional>
</define>
<define name='backupPushDriver'>
<define name="backupPushDriver">
<optional>
<element name='driver'>
<attribute name='type'>
<ref name='storageFormat'/>
<element name="driver">
<attribute name="type">
<ref name="storageFormat"/>
</attribute>
</element>
</optional>
</define>
<define name='backupPullDriver'>
<define name="backupPullDriver">
<optional>
<element name='driver'>
<attribute name='type'>
<element name="driver">
<attribute name="type">
<value>qcow2</value>
</attribute>
</element>
</optional>
</define>
<define name='backupAttr'>
<define name="backupAttr">
<optional>
<attribute name='backup'>
<attribute name="backup">
<choice>
<value>yes</value>
</choice>
@ -147,67 +147,67 @@
</optional>
</define>
<define name='backupDisksPush'>
<define name="backupDisksPush">
<optional>
<element name='disks'>
<element name="disks">
<oneOrMore>
<element name='disk'>
<attribute name='name'>
<ref name='diskTarget'/>
<element name="disk">
<attribute name="name">
<ref name="diskTarget"/>
</attribute>
<ref name='backupDiskMode'/>
<ref name="backupDiskMode"/>
<choice>
<group>
<attribute name='backup'>
<attribute name="backup">
<value>no</value>
</attribute>
</group>
<group>
<ref name='backupAttr'/>
<attribute name='type'>
<ref name="backupAttr"/>
<attribute name="type">
<value>file</value>
</attribute>
<interleave>
<optional>
<element name='target'>
<attribute name='file'>
<ref name='absFilePath'/>
<element name="target">
<attribute name="file">
<ref name="absFilePath"/>
</attribute>
<interleave>
<zeroOrMore>
<ref name='devSeclabel'/>
<ref name="devSeclabel"/>
</zeroOrMore>
<optional>
<ref name='backupEncryption'/>
<ref name="backupEncryption"/>
</optional>
</interleave>
</element>
</optional>
<ref name='backupPushDriver'/>
<ref name="backupPushDriver"/>
</interleave>
</group>
<group>
<ref name='backupAttr'/>
<attribute name='type'>
<ref name="backupAttr"/>
<attribute name="type">
<value>block</value>
</attribute>
<interleave>
<optional>
<element name='target'>
<attribute name='dev'>
<ref name='absFilePath'/>
<element name="target">
<attribute name="dev">
<ref name="absFilePath"/>
</attribute>
<interleave>
<zeroOrMore>
<ref name='devSeclabel'/>
<ref name="devSeclabel"/>
</zeroOrMore>
<optional>
<ref name='backupEncryption'/>
<ref name="backupEncryption"/>
</optional>
</interleave>
</element>
</optional>
<ref name='backupPushDriver'/>
<ref name="backupPushDriver"/>
</interleave>
</group>
</choice>
@ -217,77 +217,77 @@
</optional>
</define>
<define name='backupDisksPull'>
<define name="backupDisksPull">
<optional>
<element name='disks'>
<element name="disks">
<oneOrMore>
<element name='disk'>
<attribute name='name'>
<ref name='diskTarget'/>
<element name="disk">
<attribute name="name">
<ref name="diskTarget"/>
</attribute>
<ref name='backupDiskMode'/>
<ref name="backupDiskMode"/>
<optional>
<attribute name='exportname'>
<attribute name="exportname">
<text/>
</attribute>
</optional>
<optional>
<attribute name='exportbitmap'>
<attribute name="exportbitmap">
<text/>
</attribute>
</optional>
<choice>
<group>
<attribute name='backup'>
<attribute name="backup">
<value>no</value>
</attribute>
</group>
<group>
<optional>
<ref name='backupAttr'/>
<attribute name='type'>
<ref name="backupAttr"/>
<attribute name="type">
<value>file</value>
</attribute>
</optional>
<optional>
<interleave>
<element name='scratch'>
<attribute name='file'>
<ref name='absFilePath'/>
<element name="scratch">
<attribute name="file">
<ref name="absFilePath"/>
</attribute>
<interleave>
<zeroOrMore>
<ref name='devSeclabel'/>
<ref name="devSeclabel"/>
</zeroOrMore>
<optional>
<ref name='backupEncryption'/>
<ref name="backupEncryption"/>
</optional>
</interleave>
</element>
<ref name='backupPullDriver'/>
<ref name="backupPullDriver"/>
</interleave>
</optional>
</group>
<group>
<ref name='backupAttr'/>
<attribute name='type'>
<ref name="backupAttr"/>
<attribute name="type">
<value>block</value>
</attribute>
<interleave>
<element name='scratch'>
<attribute name='dev'>
<ref name='absFilePath'/>
<element name="scratch">
<attribute name="dev">
<ref name="absFilePath"/>
</attribute>
<interleave>
<zeroOrMore>
<ref name='devSeclabel'/>
<ref name="devSeclabel"/>
</zeroOrMore>
<optional>
<ref name='backupEncryption'/>
<ref name="backupEncryption"/>
</optional>
</interleave>
</element>
<ref name='backupPullDriver'/>
<ref name="backupPullDriver"/>
</interleave>
</group>
</choice>

View File

@ -1,116 +1,116 @@
<?xml version="1.0"?>
<!-- A Relax NG schema for the libvirt domain capabilities XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href='basictypes.rng'/>
<include href='cputypes.rng'/>
<include href="basictypes.rng"/>
<include href="cputypes.rng"/>
<start>
<ref name='domainCapabilities'/>
<ref name="domainCapabilities"/>
</start>
<define name='domainCapabilities'>
<element name='domainCapabilities'>
<define name="domainCapabilities">
<element name="domainCapabilities">
<interleave>
<element name='path'>
<element name="path">
<ref name="absFilePath"/>
</element>
<element name='domain'>
<element name="domain">
<text/>
</element>
<optional>
<element name='machine'>
<element name="machine">
<text/>
</element>
</optional>
<element name='arch'>
<element name="arch">
<text/>
</element>
<optional>
<ref name='vcpu'/>
<ref name="vcpu"/>
</optional>
<optional>
<ref name='iothreads'/>
<ref name="iothreads"/>
</optional>
<optional>
<ref name='os'/>
<ref name="os"/>
</optional>
<optional>
<ref name='cpu'/>
<ref name="cpu"/>
</optional>
<optional>
<ref name='devices'/>
<ref name="devices"/>
</optional>
<optional>
<ref name='features'/>
<ref name="features"/>
</optional>
</interleave>
</element>
</define>
<define name='vcpu'>
<element name='vcpu'>
<attribute name='max'>
<ref name='unsignedInt'/>
<define name="vcpu">
<element name="vcpu">
<attribute name="max">
<ref name="unsignedInt"/>
</attribute>
<empty/>
</element>
</define>
<define name='iothreads'>
<element name='iothreads'>
<ref name='supported'/>
<define name="iothreads">
<element name="iothreads">
<ref name="supported"/>
<empty/>
</element>
</define>
<define name='loader'>
<element name='loader'>
<ref name='supported'/>
<define name="loader">
<element name="loader">
<ref name="supported"/>
<optional>
<ref name='value'/>
<ref name="value"/>
</optional>
<ref name='enum'/>
<ref name="enum"/>
</element>
</define>
<define name='os'>
<element name='os'>
<define name="os">
<element name="os">
<interleave>
<ref name='supported'/>
<ref name='enum'/>
<ref name="supported"/>
<ref name="enum"/>
<optional>
<ref name='loader'/>
<ref name="loader"/>
</optional>
</interleave>
</element>
</define>
<define name='cpu'>
<element name='cpu'>
<ref name='cpuHost'/>
<ref name='cpuHostModel'/>
<ref name='cpuCustom'/>
<define name="cpu">
<element name="cpu">
<ref name="cpuHost"/>
<ref name="cpuHostModel"/>
<ref name="cpuCustom"/>
</element>
</define>
<define name='cpuHost'>
<element name='mode'>
<attribute name='name'>
<define name="cpuHost">
<element name="mode">
<attribute name="name">
<value>host-passthrough</value>
</attribute>
<ref name='supported'/>
<ref name="supported"/>
<optional>
<ref name='enum'/>
<ref name="enum"/>
</optional>
</element>
</define>
<define name='cpuHostModel'>
<element name='mode'>
<attribute name='name'>
<define name="cpuHostModel">
<element name="mode">
<attribute name="name">
<value>host-model</value>
</attribute>
<ref name='supported'/>
<ref name="supported"/>
<optional>
<ref name="cpuModel"/>
<optional>
@ -123,15 +123,15 @@
</element>
</define>
<define name='cpuCustom'>
<element name='mode'>
<attribute name='name'>
<define name="cpuCustom">
<element name="mode">
<attribute name="name">
<value>custom</value>
</attribute>
<ref name='supported'/>
<ref name="supported"/>
<zeroOrMore>
<element name='model'>
<attribute name='usable'>
<element name="model">
<attribute name="usable">
<choice>
<value>yes</value>
<value>no</value>
@ -144,150 +144,150 @@
</element>
</define>
<define name='devices'>
<element name='devices'>
<define name="devices">
<element name="devices">
<optional>
<ref name='disk'/>
<ref name="disk"/>
</optional>
<optional>
<ref name='graphics'/>
<ref name="graphics"/>
</optional>
<optional>
<ref name='video'/>
<ref name="video"/>
</optional>
<optional>
<ref name='hostdev'/>
<ref name="hostdev"/>
</optional>
<optional>
<ref name='rng'/>
<ref name="rng"/>
</optional>
</element>
</define>
<define name='disk'>
<element name='disk'>
<ref name='supported'/>
<ref name='enum'/>
<define name="disk">
<element name="disk">
<ref name="supported"/>
<ref name="enum"/>
</element>
</define>
<define name='graphics'>
<element name='graphics'>
<ref name='supported'/>
<ref name='enum'/>
<define name="graphics">
<element name="graphics">
<ref name="supported"/>
<ref name="enum"/>
</element>
</define>
<define name='video'>
<element name='video'>
<ref name='supported'/>
<ref name='enum'/>
<define name="video">
<element name="video">
<ref name="supported"/>
<ref name="enum"/>
</element>
</define>
<define name='hostdev'>
<element name='hostdev'>
<ref name='supported'/>
<ref name='enum'/>
<define name="hostdev">
<element name="hostdev">
<ref name="supported"/>
<ref name="enum"/>
</element>
</define>
<define name='rng'>
<element name='rng'>
<ref name='supported'/>
<ref name='enum'/>
<define name="rng">
<element name="rng">
<ref name="supported"/>
<ref name="enum"/>
</element>
</define>
<define name='features'>
<element name='features'>
<define name="features">
<element name="features">
<optional>
<ref name='gic'/>
<ref name="gic"/>
</optional>
<optional>
<ref name='vmcoreinfo'/>
<ref name="vmcoreinfo"/>
</optional>
<optional>
<ref name='vmgenid'/>
<ref name="vmgenid"/>
</optional>
<optional>
<ref name='backingStoreInput'/>
<ref name="backingStoreInput"/>
</optional>
<optional>
<ref name='backup'/>
<ref name="backup"/>
</optional>
<optional>
<ref name='sev'/>
<ref name="sev"/>
</optional>
</element>
</define>
<define name='gic'>
<element name='gic'>
<ref name='supported'/>
<ref name='enum'/>
<define name="gic">
<element name="gic">
<ref name="supported"/>
<ref name="enum"/>
</element>
</define>
<define name='vmcoreinfo'>
<element name='vmcoreinfo'>
<ref name='supported'/>
<define name="vmcoreinfo">
<element name="vmcoreinfo">
<ref name="supported"/>
</element>
</define>
<define name='vmgenid'>
<element name='genid'>
<ref name='supported'/>
<define name="vmgenid">
<element name="genid">
<ref name="supported"/>
</element>
</define>
<define name='backingStoreInput'>
<element name='backingStoreInput'>
<ref name='supported'/>
<define name="backingStoreInput">
<element name="backingStoreInput">
<ref name="supported"/>
</element>
</define>
<define name='backup'>
<element name='backup'>
<ref name='supported'/>
<define name="backup">
<element name="backup">
<ref name="supported"/>
</element>
</define>
<define name='sev'>
<element name='sev'>
<ref name='supported'/>
<define name="sev">
<element name="sev">
<ref name="supported"/>
<optional>
<element name='cbitpos'>
<data type='unsignedInt'/>
<element name="cbitpos">
<data type="unsignedInt"/>
</element>
<element name='reducedPhysBits'>
<data type='unsignedInt'/>
<element name="reducedPhysBits">
<data type="unsignedInt"/>
</element>
</optional>
</element>
</define>
<define name='value'>
<define name="value">
<zeroOrMore>
<element name='value'>
<element name="value">
<text/>
</element>
</zeroOrMore>
</define>
<define name='supported'>
<attribute name='supported'>
<define name="supported">
<attribute name="supported">
<ref name="virYesNo"/>
</attribute>
</define>
<define name='enum'>
<define name="enum">
<zeroOrMore>
<element name='enum'>
<attribute name='name'>
<element name="enum">
<attribute name="name">
<text/>
</attribute>
<ref name='value'/>
<ref name="value"/>
</element>
</zeroOrMore>
</define>

View File

@ -1,34 +1,34 @@
<?xml version='1.0'?>
<?xml version="1.0"?>
<!-- A Relax NG schema for the libvirt domain checkpoint properties XML format -->
<grammar xmlns='http://relaxng.org/ns/structure/1.0' datatypeLibrary='http://www.w3.org/2001/XMLSchema-datatypes'>
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<start>
<ref name='domaincheckpoint'/>
<ref name="domaincheckpoint"/>
</start>
<include href='domaincommon.rng'/>
<include href="domaincommon.rng"/>
<define name='domaincheckpoint'>
<element name='domaincheckpoint'>
<define name="domaincheckpoint">
<element name="domaincheckpoint">
<interleave>
<optional>
<element name='name'>
<ref name='checkpointName'/>
<element name="name">
<ref name="checkpointName"/>
</element>
</optional>
<optional>
<element name='description'>
<element name="description">
<text/>
</element>
</optional>
<optional>
<element name='creationTime'>
<ref name='unsignedLong'/>
<element name="creationTime">
<ref name="unsignedLong"/>
</element>
</optional>
<optional>
<element name='disks'>
<element name="disks">
<oneOrMore>
<ref name='diskcheckpoint'/>
<ref name="diskcheckpoint"/>
</oneOrMore>
</element>
</optional>
@ -37,13 +37,13 @@
storagecommon/domaincommon defines do not conflict
with any domain.rng overrides. -->
<grammar>
<include href='domain.rng'/>
<include href="domain.rng"/>
</grammar>
</optional>
<optional>
<element name='parent'>
<element name='name'>
<ref name='checkpointName'/>
<element name="parent">
<element name="name">
<ref name="checkpointName"/>
</element>
</element>
</optional>
@ -51,32 +51,32 @@
</element>
</define>
<define name='diskcheckpoint'>
<element name='disk'>
<attribute name='name'>
<define name="diskcheckpoint">
<element name="disk">
<attribute name="name">
<choice>
<ref name='diskTarget'/>
<ref name='absFilePath'/>
<ref name="diskTarget"/>
<ref name="absFilePath"/>
</choice>
</attribute>
<choice>
<attribute name='checkpoint'>
<attribute name="checkpoint">
<value>no</value>
</attribute>
<group>
<optional>
<attribute name='checkpoint'>
<attribute name="checkpoint">
<value>bitmap</value>
</attribute>
</optional>
<optional>
<attribute name='bitmap'>
<attribute name="bitmap">
<text/>
</attribute>
</optional>
<optional>
<attribute name='size'>
<ref name='unsignedLong'/>
<attribute name="size">
<ref name="unsignedLong"/>
</attribute>
</optional>
</group>
@ -84,10 +84,10 @@
</element>
</define>
<define name='checkpointName'>
<data type='string'>
<!-- Notably: no leading '.' and no embedded '/' or newline -->
<param name='pattern'>[a-zA-Z0-9_\-][a-zA-Z0-9_\-.]*</param>
<define name="checkpointName">
<data type="string">
<!-- Notably: no leading "." and no embedded "/" or newline -->
<param name="pattern">[a-zA-Z0-9_\-][a-zA-Z0-9_\-.]*</param>
</data>
</define>

File diff suppressed because it is too large Load Diff

View File

@ -2,38 +2,38 @@
<!-- A Relax NG schema for the libvirt domain snapshot properties XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<start>
<ref name='domainsnapshot'/>
<ref name="domainsnapshot"/>
</start>
<include href='domaincommon.rng'/>
<include href="domaincommon.rng"/>
<define name='domainsnapshot'>
<element name='domainsnapshot'>
<define name="domainsnapshot">
<element name="domainsnapshot">
<interleave>
<optional>
<element name='name'>
<element name="name">
<text/>
</element>
</optional>
<optional>
<element name='description'>
<element name="description">
<text/>
</element>
</optional>
<optional>
<element name='state'>
<ref name='state'/>
<element name="state">
<ref name="state"/>
</element>
</optional>
<optional>
<element name='creationTime'>
<element name="creationTime">
<text/>
</element>
</optional>
<optional>
<element name='memory'>
<element name="memory">
<choice>
<attribute name='snapshot'>
<attribute name="snapshot">
<choice>
<value>no</value>
<value>internal</value>
@ -41,12 +41,12 @@
</attribute>
<group>
<optional>
<attribute name='snapshot'>
<attribute name="snapshot">
<value>external</value>
</attribute>
</optional>
<attribute name='file'>
<ref name='absFilePath'/>
<attribute name="file">
<ref name="absFilePath"/>
</attribute>
</group>
</choice>
@ -54,14 +54,14 @@
</element>
</optional>
<optional>
<element name='disks'>
<element name="disks">
<zeroOrMore>
<ref name='disksnapshot'/>
<ref name="disksnapshot"/>
</zeroOrMore>
</element>
</optional>
<optional>
<element name='active'>
<element name="active">
<choice>
<value>0</value>
<value>1</value>
@ -70,8 +70,8 @@
</optional>
<optional>
<choice>
<element name='domain'>
<element name='uuid'>
<element name="domain">
<element name="uuid">
<ref name="UUID"/>
</element>
</element>
@ -79,21 +79,21 @@
storagecommon/domaincommon defines do not conflict
with any domain.rng overrides. -->
<grammar>
<include href='domain.rng'/>
<include href="domain.rng"/>
</grammar>
</choice>
</optional>
<optional>
<element name='parent'>
<element name='name'>
<element name="parent">
<element name="name">
<text/>
</element>
</element>
</optional>
<optional>
<element name='cookie'>
<element name="cookie">
<zeroOrMore>
<ref name='customElement'/>
<ref name="customElement"/>
</zeroOrMore>
</element>
</optional>
@ -101,7 +101,7 @@
</element>
</define>
<define name='state'>
<define name="state">
<choice>
<value>running</value>
<value>blocked</value>
@ -113,55 +113,55 @@
</choice>
</define>
<define name='storageSourceExtra' combine='choice'>
<define name="storageSourceExtra" combine="choice">
<!-- overrides the no-op version in storagecommon.rng -->
<ref name='disksnapshotdriver'/>
<ref name="disksnapshotdriver"/>
</define>
<define name='disksnapshot'>
<element name='disk'>
<attribute name='name'>
<define name="disksnapshot">
<element name="disk">
<attribute name="name">
<choice>
<ref name='diskTarget'/>
<ref name='absFilePath'/>
<ref name="diskTarget"/>
<ref name="absFilePath"/>
</choice>
</attribute>
<choice>
<attribute name='snapshot'>
<attribute name="snapshot">
<value>no</value>
</attribute>
<attribute name='snapshot'>
<attribute name="snapshot">
<value>internal</value>
</attribute>
<group>
<optional>
<attribute name='snapshot'>
<attribute name="snapshot">
<value>external</value>
</attribute>
</optional>
<choice>
<group>
<optional>
<attribute name='type'>
<attribute name="type">
<value>file</value>
</attribute>
</optional>
<interleave>
<optional>
<element name='source'>
<element name="source">
<optional>
<attribute name='file'>
<ref name='absFilePath'/>
<attribute name="file">
<ref name="absFilePath"/>
</attribute>
</optional>
<optional>
<ref name='storageStartupPolicy'/>
<ref name="storageStartupPolicy"/>
</optional>
<zeroOrMore>
<ref name='devSeclabel'/>
<ref name="devSeclabel"/>
</zeroOrMore>
<optional>
<ref name='diskSourceCommon'/>
<ref name="diskSourceCommon"/>
</optional>
<optional>
<ref name="encryption"/>
@ -169,11 +169,11 @@
<empty/>
</element>
</optional>
<ref name='storageSourceExtra'/>
<ref name="storageSourceExtra"/>
</interleave>
</group>
<group>
<attribute name='type'>
<attribute name="type">
<value>block</value>
</attribute>
<interleave>
@ -183,10 +183,10 @@
<ref name="absFilePath"/>
</attribute>
<zeroOrMore>
<ref name='devSeclabel'/>
<ref name="devSeclabel"/>
</zeroOrMore>
<optional>
<ref name='diskSourceCommon'/>
<ref name="diskSourceCommon"/>
</optional>
<optional>
<ref name="encryption"/>
@ -194,22 +194,22 @@
<empty/>
</element>
</optional>
<ref name='storageSourceExtra'/>
<ref name="storageSourceExtra"/>
</interleave>
</group>
<ref name='diskSourceNetwork'/>
<ref name="diskSourceNetwork"/>
</choice>
</group>
</choice>
</element>
</define>
<define name='disksnapshotdriver'>
<define name="disksnapshotdriver">
<optional>
<element name='driver'>
<element name="driver">
<optional>
<attribute name='type'>
<ref name='storageFormatBacking'/>
<attribute name="type">
<ref name="storageFormatBacking"/>
</attribute>
</optional>
<empty/>

View File

@ -17,7 +17,7 @@
</choice>
</start>
<include href='basictypes.rng'/>
<include href="basictypes.rng"/>
<!--
FIXME: How do we handle VLAN's ? Should they be their own interface
or should we treat them as an option on the base interface ? For
@ -131,7 +131,7 @@
</attribute>
</optional>
<!-- Bridge forward delay
(see 'ip link set <dev> type bridge forward_delay') -->
(see "ip link set <dev> type bridge forward_delay") -->
<optional v:since="2">
<attribute name="delay"><ref name="timeval"/></attribute>
</optional>
@ -426,7 +426,7 @@
</data>
</define>
<define name='vlan-id'>
<define name="vlan-id">
<data type="unsignedInt">
<param name="maxInclusive">4095</param>
</data>

View File

@ -6,8 +6,8 @@
<ref name="network"/>
</start>
<include href='basictypes.rng'/>
<include href='networkcommon.rng'/>
<include href="basictypes.rng"/>
<include href="networkcommon.rng"/>
<define name="network">
@ -133,9 +133,9 @@
<choice>
<group>
<zeroOrMore>
<element name='interface'>
<attribute name='dev'>
<ref name='deviceName'/>
<element name="interface">
<attribute name="dev">
<ref name="deviceName"/>
</attribute>
<optional>
<attribute name="connections">
@ -147,8 +147,8 @@
</group>
<group>
<zeroOrMore>
<element name='address'>
<attribute name='type'>
<element name="address">
<attribute name="type">
<value>pci</value>
</attribute>
<ref name="pciaddress"/>
@ -162,9 +162,9 @@
</group>
</choice>
<optional>
<element name='pf'>
<attribute name='dev'>
<ref name='deviceName'/>
<element name="pf">
<attribute name="dev">
<ref name="deviceName"/>
</attribute>
</element>
</optional>
@ -180,7 +180,7 @@
</element>
</optional>
<optional>
<element name='nat'>
<element name="nat">
<optional>
<attribute name="ipv6">
<ref name="virYesNo"/>
@ -188,22 +188,22 @@
</optional>
<interleave>
<optional>
<element name='address'>
<attribute name='start'>
<ref name='ipv4Addr'/>
<element name="address">
<attribute name="start">
<ref name="ipv4Addr"/>
</attribute>
<attribute name='end'>
<ref name='ipv4Addr'/>
<attribute name="end">
<ref name="ipv4Addr"/>
</attribute>
</element>
</optional>
<optional>
<element name='port'>
<attribute name='start'>
<ref name='port'/>
<element name="port">
<attribute name="start">
<ref name="port"/>
</attribute>
<attribute name='end'>
<ref name='port'/>
<attribute name="end">
<ref name="port"/>
</attribute>
</element>
</optional>
@ -439,7 +439,7 @@
<element name="options" ns="http://libvirt.org/schemas/network/dnsmasq/1.0">
<zeroOrMore>
<element name="option">
<attribute name='value'/>
<attribute name="value"/>
</element>
</zeroOrMore>
</element>

View File

@ -173,7 +173,7 @@
</attribute>
</optional>
<optional>
<attribute name='burst'>
<attribute name="burst">
<ref name="BurstSize"/>
</attribute>
</optional>
@ -192,19 +192,19 @@
</data>
</define>
<define name='unsignedShort'>
<data type='integer'>
<define name="unsignedShort">
<data type="integer">
<param name="minInclusive">0</param>
<param name="maxInclusive">65535</param>
</data>
</define>
<define name='protocol'>
<data type='string'>
<param name='pattern'>(tcp)|(udp)</param>
<define name="protocol">
<data type="string">
<param name="pattern">(tcp)|(udp)</param>
</data>
</define>
<define name='addr-family'>
<data type='string'>
<define name="addr-family">
<data type="string">
<param name="pattern">(ipv4)|(ipv6)</param>
</data>
</define>
@ -237,17 +237,17 @@
</element>
</define>
<define name='port'>
<data type='integer'>
<param name='minInclusive'>1</param>
<param name='maxInclusive'>65535</param>
<define name="port">
<data type="integer">
<param name="minInclusive">1</param>
<param name="maxInclusive">65535</param>
</data>
</define>
<!-- The (static) route element specifies a network address and gateway
address to access that network. Both the network address and
the gateway address must be specified. -->
<define name='route'>
<define name="route">
<element name="route">
<optional>
<attribute name="family"><ref name="addr-family"/></attribute>

View File

@ -2,8 +2,8 @@
<!-- A Relax NG schema for the libvirt network port XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href='basictypes.rng'/>
<include href='networkcommon.rng'/>
<include href="basictypes.rng"/>
<include href="networkcommon.rng"/>
<start>
<ref name="networkport"/>
@ -152,7 +152,7 @@
<empty/>
</element>
</optional>
<element name='address'>
<element name="address">
<ref name="pciaddress"/>
</element>
</define>

View File

@ -2,12 +2,12 @@
<!-- A Relax NG schema for the libvirt node device XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href='basictypes.rng'/>
<include href="basictypes.rng"/>
<start>
<ref name='device'/>
<ref name="device"/>
</start>
<define name='device'>
<define name="device">
<element name="device">
<!-- The name of the network, used to refer to it through the API
and in virsh -->
@ -17,7 +17,7 @@
</optional>
<optional>
<element name="devnode">
<attribute name='type'>
<attribute name="type">
<value>dev</value>
</attribute>
<text/>
@ -25,7 +25,7 @@
</optional>
<zeroOrMore>
<element name="devnode">
<attribute name='type'>
<attribute name="type">
<value>link</value>
</attribute>
<text/>
@ -47,21 +47,21 @@
</element>
</define>
<define name='parent'>
<element name='parent'>
<define name="parent">
<element name="parent">
<choice>
<group>
<attribute name='wwnn'>
<ref name='wwn'/>
<attribute name="wwnn">
<ref name="wwn"/>
</attribute>
<attribute name='wwpn'>
<ref name='wwn'/>
<attribute name="wwpn">
<ref name="wwn"/>
</attribute>
<empty/>
</group>
<group>
<attribute name='fabric_wwn'>
<ref name='wwn'/>
<attribute name="fabric_wwn">
<ref name="wwn"/>
</attribute>
<empty/>
</group>
@ -70,7 +70,7 @@
</element>
</define>
<define name='capability'>
<define name="capability">
<element name="capability">
<choice>
<ref name="capsystem"/>
@ -90,73 +90,73 @@
</element>
</define>
<define name='capsystem'>
<attribute name='type'>
<define name="capsystem">
<attribute name="type">
<value>system</value>
</attribute>
<optional>
<element name='product'><text/></element>
<element name="product"><text/></element>
</optional>
<element name='hardware'>
<element name="hardware">
<optional>
<element name='vendor'><text/></element>
<element name="vendor"><text/></element>
</optional>
<optional>
<element name='version'><text/></element>
<element name="version"><text/></element>
</optional>
<optional>
<element name='serial'><text/></element>
<element name="serial"><text/></element>
</optional>
<element name='uuid'>
<ref name='UUID'/>
<element name="uuid">
<ref name="UUID"/>
</element>
</element>
<element name='firmware'>
<element name="firmware">
<optional>
<element name='vendor'><text/></element>
<element name="vendor"><text/></element>
</optional>
<optional>
<element name='version'><text/></element>
<element name="version"><text/></element>
</optional>
<optional>
<element name='release_date'><text/></element>
<element name="release_date"><text/></element>
</optional>
</element>
</define>
<define name='cappcidev'>
<attribute name='type'>
<define name="cappcidev">
<attribute name="type">
<value>pci</value>
</attribute>
<optional>
<element name='class'>
<element name="class">
<data type="string">
<param name="pattern">0x[0-9a-fA-F]{6}</param>
</data>
</element>
</optional>
<element name='domain'>
<ref name='unsignedLong'/>
<element name="domain">
<ref name="unsignedLong"/>
</element>
<element name='bus'>
<ref name='unsignedLong'/>
<element name="bus">
<ref name="unsignedLong"/>
</element>
<element name='slot'>
<ref name='unsignedLong'/>
<element name="slot">
<ref name="unsignedLong"/>
</element>
<element name='function'>
<ref name='unsignedLong'/>
<element name="function">
<ref name="unsignedLong"/>
</element>
<element name='product'>
<attribute name='id'>
<ref name='hexuint'/>
<element name="product">
<attribute name="id">
<ref name="hexuint"/>
</attribute>
<choice>
@ -165,9 +165,9 @@
</choice>
</element>
<element name='vendor'>
<attribute name='id'>
<ref name='hexuint'/>
<element name="vendor">
<attribute name="id">
<ref name="hexuint"/>
</attribute>
<choice>
@ -177,35 +177,35 @@
</element>
<optional>
<element name='capability'>
<attribute name='type'>
<element name="capability">
<attribute name="type">
<value>phys_function</value>
</attribute>
<optional>
<ref name='address'/>
<ref name="address"/>
</optional>
</element>
</optional>
<optional>
<element name='capability'>
<attribute name='type'>
<element name="capability">
<attribute name="type">
<value>virt_functions</value>
</attribute>
<optional>
<attribute name='maxCount'>
<ref name='unsignedInt'/>
<attribute name="maxCount">
<ref name="unsignedInt"/>
</attribute>
</optional>
<zeroOrMore>
<ref name='address'/>
<ref name="address"/>
</zeroOrMore>
</element>
</optional>
<optional>
<element name='capability'>
<attribute name='type'>
<element name="capability">
<attribute name="type">
<choice>
<value>pci-bridge</value>
<value>cardbus-bridge</value>
@ -215,23 +215,23 @@
</optional>
<optional>
<element name='capability'>
<attribute name='type'>
<element name="capability">
<attribute name="type">
<value>mdev_types</value>
</attribute>
<oneOrMore>
<element name='type'>
<attribute name='id'>
<data type='string'/>
<element name="type">
<attribute name="id">
<data type="string"/>
</attribute>
<optional>
<element name='name'><text/></element>
<element name="name"><text/></element>
</optional>
<element name='deviceAPI'>
<element name="deviceAPI">
<value>vfio-pci</value>
</element>
<element name='availableInstances'>
<ref name='unsignedInt'/>
<element name="availableInstances">
<ref name="unsignedInt"/>
</element>
</element>
</oneOrMore>
@ -239,50 +239,50 @@
</optional>
<optional>
<element name='iommuGroup'>
<attribute name='number'>
<ref name='unsignedInt'/>
<element name="iommuGroup">
<attribute name="number">
<ref name="unsignedInt"/>
</attribute>
<oneOrMore>
<ref name='address'/>
<ref name="address"/>
</oneOrMore>
</element>
</optional>
<optional>
<element name='numa'>
<element name="numa">
<optional>
<attribute name='node'>
<data type='int'/>
<attribute name="node">
<data type="int"/>
</attribute>
</optional>
</element>
</optional>
<optional>
<element name='pci-express'>
<element name="pci-express">
<zeroOrMore>
<element name='link'>
<attribute name='validity'>
<element name="link">
<attribute name="validity">
<choice>
<value>cap</value>
<value>sta</value>
</choice>
</attribute>
<optional>
<attribute name='port'>
<ref name='unsignedInt'/>
<attribute name="port">
<ref name="unsignedInt"/>
</attribute>
</optional>
<optional>
<attribute name='speed'>
<attribute name="speed">
<data type="string">
<param name="pattern">[0-9]+(.[0-9]+)?</param>
</data>
</attribute>
</optional>
<attribute name='width'>
<ref name='unsignedInt'/>
<attribute name="width">
<ref name="unsignedInt"/>
</attribute>
</element>
</zeroOrMore>
@ -290,21 +290,21 @@
</optional>
</define>
<define name='capusbdev'>
<attribute name='type'>
<define name="capusbdev">
<attribute name="type">
<value>usb_device</value>
</attribute>
<element name='bus'>
<ref name='unsignedLong'/>
<element name="bus">
<ref name="unsignedLong"/>
</element>
<element name='device'>
<ref name='unsignedLong'/>
<element name="device">
<ref name="unsignedLong"/>
</element>
<element name='product'>
<attribute name='id'>
<ref name='hexuint'/>
<element name="product">
<attribute name="id">
<ref name="hexuint"/>
</attribute>
<choice>
@ -313,9 +313,9 @@
</choice>
</element>
<element name='vendor'>
<attribute name='id'>
<ref name='hexuint'/>
<element name="vendor">
<attribute name="id">
<ref name="hexuint"/>
</attribute>
<choice>
@ -325,294 +325,294 @@
</element>
</define>
<define name='capusbinterface'>
<attribute name='type'>
<define name="capusbinterface">
<attribute name="type">
<value>usb</value>
</attribute>
<element name='number'>
<ref name='unsignedLong'/>
<element name="number">
<ref name="unsignedLong"/>
</element>
<element name='class'>
<ref name='unsignedLong'/>
<element name="class">
<ref name="unsignedLong"/>
</element>
<element name='subclass'>
<ref name='unsignedLong'/>
<element name="subclass">
<ref name="unsignedLong"/>
</element>
<element name='protocol'>
<ref name='unsignedLong'/>
<element name="protocol">
<ref name="unsignedLong"/>
</element>
<optional>
<element name='description'>
<element name="description">
<text/>
</element>
</optional>
</define>
<define name='capnet'>
<attribute name='type'>
<define name="capnet">
<attribute name="type">
<value>net</value>
</attribute>
<element name='interface'>
<element name="interface">
<text/>
</element>
<optional>
<element name='address'>
<ref name='mac'/>
<element name="address">
<ref name="mac"/>
</element>
</optional>
<ref name="link-speed-state"/>
<zeroOrMore>
<element name='feature'>
<attribute name='name'>
<ref name='netfeaturename'/>
<element name="feature">
<attribute name="name">
<ref name="netfeaturename"/>
</attribute>
</element>
</zeroOrMore>
<zeroOrMore>
<ref name='subcapnet'/>
<ref name="subcapnet"/>
</zeroOrMore>
</define>
<define name='netfeaturename'>
<data type='string'>
<param name='pattern'>[a-zA-Z\-_]+</param>
<define name="netfeaturename">
<data type="string">
<param name="pattern">[a-zA-Z\-_]+</param>
</data>
</define>
<define name='subcapnet'>
<element name='capability'>
<define name="subcapnet">
<element name="capability">
<choice>
<ref name='subcapnet80203'/>
<ref name='subcapnet80211'/>
<ref name="subcapnet80203"/>
<ref name="subcapnet80211"/>
</choice>
</element>
</define>
<define name='subcapnet80203'>
<attribute name='type'>
<define name="subcapnet80203">
<attribute name="type">
<value>80203</value>
</attribute>
</define>
<define name='subcapnet80211'>
<attribute name='type'>
<define name="subcapnet80211">
<attribute name="type">
<value>80211</value>
</attribute>
</define>
<define name='capsfchost'>
<attribute name='type'>
<define name="capsfchost">
<attribute name="type">
<value>fc_host</value>
</attribute>
<element name='wwnn'>
<ref name='wwn'/>
<element name="wwnn">
<ref name="wwn"/>
</element>
<element name='wwpn'>
<ref name='wwn'/>
<element name="wwpn">
<ref name="wwn"/>
</element>
<optional>
<element name='fabric_wwn'>
<ref name='wwn'/>
<element name="fabric_wwn">
<ref name="wwn"/>
</element>
</optional>
</define>
<define name='capsvports'>
<attribute name='type'>
<define name="capsvports">
<attribute name="type">
<value>vports_ops</value>
</attribute>
<element name='max_vports'>
<ref name='unsignedInt'/>
<element name="max_vports">
<ref name="unsignedInt"/>
</element>
<element name='vports'>
<ref name='unsignedInt'/>
<element name="vports">
<ref name="unsignedInt"/>
</element>
</define>
<define name='capscsihost'>
<attribute name='type'>
<define name="capscsihost">
<attribute name="type">
<value>scsi_host</value>
</attribute>
<element name='host'>
<ref name='unsignedLong'/>
<element name="host">
<ref name="unsignedLong"/>
</element>
<optional>
<element name='unique_id'>
<ref name='positiveInteger'/>
<element name="unique_id">
<ref name="positiveInteger"/>
</element>
</optional>
<optional>
<zeroOrMore>
<element name='capability'>
<element name="capability">
<choice>
<ref name='capsfchost'/>
<ref name='capsvports'/>
<ref name="capsfchost"/>
<ref name="capsvports"/>
</choice>
</element>
</zeroOrMore>
</optional>
</define>
<define name='capsfcrport'>
<attribute name='type'>
<define name="capsfcrport">
<attribute name="type">
<value>fc_remote_port</value>
</attribute>
<element name='rport'>
<element name="rport">
<text/>
</element>
<element name='wwpn'>
<ref name='wwn'/>
<element name="wwpn">
<ref name="wwn"/>
</element>
</define>
<define name='capscsitarget'>
<attribute name='type'>
<define name="capscsitarget">
<attribute name="type">
<value>scsi_target</value>
</attribute>
<element name='target'>
<element name="target">
<text/>
</element>
<optional>
<element name='capability'>
<ref name='capsfcrport'/>
<element name="capability">
<ref name="capsfcrport"/>
</element>
</optional>
</define>
<define name='capscsi'>
<attribute name='type'>
<define name="capscsi">
<attribute name="type">
<value>scsi</value>
</attribute>
<element name='host'>
<ref name='unsignedLong'/>
<element name="host">
<ref name="unsignedLong"/>
</element>
<element name='bus'>
<ref name='unsignedLong'/>
<element name="bus">
<ref name="unsignedLong"/>
</element>
<element name='target'>
<ref name='unsignedLong'/>
<element name="target">
<ref name="unsignedLong"/>
</element>
<element name='lun'>
<ref name='unsignedLong'/>
<element name="lun">
<ref name="unsignedLong"/>
</element>
<element name='type'>
<element name="type">
<text/>
</element>
</define>
<define name='capstorage'>
<attribute name='type'>
<define name="capstorage">
<attribute name="type">
<value>storage</value>
</attribute>
<element name='block'>
<ref name='path'/>
<element name="block">
<ref name="path"/>
</element>
<optional>
<element name='bus'>
<element name="bus">
<text/>
</element>
</optional>
<optional>
<element name='drive_type'>
<element name="drive_type">
<text/>
</element>
</optional>
<optional>
<element name='model'>
<element name="model">
<text/>
</element>
</optional>
<optional>
<element name='vendor'>
<element name="vendor">
<text/>
</element>
</optional>
<optional>
<element name='serial'>
<element name="serial">
<text/>
</element>
</optional>
<choice>
<ref name='capstorageremoveable'/>
<ref name='capstoragefixed'/>
<ref name="capstorageremoveable"/>
<ref name="capstoragefixed"/>
</choice>
<optional>
<element name='capability'>
<attribute name='type'>
<element name="capability">
<attribute name="type">
<value>hotpluggable</value>
</attribute>
</element>
</optional>
</define>
<define name='capstorageremoveable'>
<element name='capability'>
<attribute name='type'>
<define name="capstorageremoveable">
<element name="capability">
<attribute name="type">
<value>removable</value>
</attribute>
<element name='media_available'>
<element name="media_available">
<choice>
<value>1</value>
<value>0</value>
</choice>
</element>
<element name='media_size'>
<ref name='unsignedLong'/>
<element name="media_size">
<ref name="unsignedLong"/>
</element>
<optional>
<element name='media_label'>
<element name="media_label">
<text/>
</element>
</optional>
<ref name='blockData'/>
<ref name="blockData"/>
</element>
</define>
<define name='capstoragefixed'>
<element name='size'>
<ref name='unsignedLong'/>
<define name="capstoragefixed">
<element name="size">
<ref name="unsignedLong"/>
</element>
<ref name='blockData'/>
<ref name="blockData"/>
</define>
<define name='blockData'>
<define name="blockData">
<optional>
<element name='logical_block_size'>
<ref name='unsignedLong'/>
<element name="logical_block_size">
<ref name="unsignedLong"/>
</element>
<element name='num_blocks'>
<ref name='unsignedLong'/>
<element name="num_blocks">
<ref name="unsignedLong"/>
</element>
</optional>
</define>
<define name='capdrm'>
<attribute name='type'>
<define name="capdrm">
<attribute name="type">
<value>drm</value>
</attribute>
<element name='type'>
<element name="type">
<choice>
<value>primary</value>
<value>control</value>
@ -621,19 +621,19 @@
</element>
</define>
<define name='capmdev'>
<attribute name='type'>
<define name="capmdev">
<attribute name="type">
<value>mdev</value>
</attribute>
<element name='type'>
<attribute name='id'>
<data type='string'/>
<element name="type">
<attribute name="id">
<data type="string"/>
</attribute>
</element>
<optional>
<element name='iommuGroup'>
<attribute name='number'>
<ref name='unsignedInt'/>
<element name="iommuGroup">
<attribute name="number">
<ref name="unsignedInt"/>
</attribute>
</element>
</optional>
@ -645,53 +645,53 @@
</zeroOrMore>
</define>
<define name='capccwdev'>
<attribute name='type'>
<define name="capccwdev">
<attribute name="type">
<value>ccw</value>
</attribute>
<element name='cssid'>
<ref name='ccwCssidRange'/>
<element name="cssid">
<ref name="ccwCssidRange"/>
</element>
<element name='ssid'>
<ref name='ccwSsidRange'/>
<element name="ssid">
<ref name="ccwSsidRange"/>
</element>
<element name='devno'>
<ref name='ccwDevnoRange'/>
<element name="devno">
<ref name="ccwDevnoRange"/>
</element>
</define>
<define name='capcssdev'>
<attribute name='type'>
<define name="capcssdev">
<attribute name="type">
<value>css</value>
</attribute>
<element name='cssid'>
<ref name='ccwCssidRange'/>
<element name="cssid">
<ref name="ccwCssidRange"/>
</element>
<element name='ssid'>
<ref name='ccwSsidRange'/>
<element name="ssid">
<ref name="ccwSsidRange"/>
</element>
<element name='devno'>
<ref name='ccwDevnoRange'/>
<element name="devno">
<ref name="ccwDevnoRange"/>
</element>
</define>
<define name='address'>
<element name='address'>
<attribute name='domain'><ref name='hexuint'/></attribute>
<attribute name='bus'><ref name='hexuint'/></attribute>
<attribute name='slot'><ref name='hexuint'/></attribute>
<attribute name='function'><ref name='hexuint'/></attribute>
<define name="address">
<element name="address">
<attribute name="domain"><ref name="hexuint"/></attribute>
<attribute name="bus"><ref name="hexuint"/></attribute>
<attribute name="slot"><ref name="hexuint"/></attribute>
<attribute name="function"><ref name="hexuint"/></attribute>
</element>
</define>
<define name='mac'>
<data type='string'>
<define name="mac">
<data type="string">
<param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param>
</data>
</define>
<define name='path'>
<data type='string'>
<define name="path">
<data type="string">
<param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param>
</data>
</define>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar ns="" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href='basictypes.rng'/>
<include href='nwfilter_params.rng'/>
<include href="basictypes.rng"/>
<include href="nwfilter_params.rng"/>
<start>
<ref name="filter"/>
</start>
@ -242,26 +242,26 @@
</optional>
<optional>
<attribute name="priority">
<ref name='priority-type'/>
<ref name="priority-type"/>
</attribute>
</optional>
</define>
<define name="rule-node-attributes">
<attribute name="action">
<ref name='action-type'/>
<ref name="action-type"/>
</attribute>
<attribute name="direction">
<ref name='direction-type'/>
<ref name="direction-type"/>
</attribute>
<optional>
<attribute name="priority">
<ref name='priority-type'/>
<ref name="priority-type"/>
</attribute>
</optional>
<optional>
<attribute name="statematch">
<ref name='statematch-type'/>
<ref name="statematch-type"/>
</attribute>
</optional>
</define>
@ -923,7 +923,7 @@
</choice>
</define>
<define name='action-type'>
<define name="action-type">
<choice>
<value>drop</value>
<value>accept</value>
@ -933,7 +933,7 @@
</choice>
</define>
<define name='direction-type'>
<define name="direction-type">
<choice>
<value>in</value>
<value>out</value>
@ -941,35 +941,35 @@
</choice>
</define>
<define name='priority-type'>
<define name="priority-type">
<data type="int">
<param name="minInclusive">-1000</param>
<param name="maxInclusive">1000</param>
</data>
</define>
<define name='statematch-type'>
<define name="statematch-type">
<data type="string">
<param name="pattern">([Ff][Aa][Ll][Ss][Ee]|0)</param>
</data>
</define>
<define name='comment-type'>
<define name="comment-type">
<data type="string"/>
</define>
<define name='stateflags-type'>
<define name="stateflags-type">
<data type="string">
<param name="pattern">((NEW|ESTABLISHED|RELATED|INVALID)(,(NEW|ESTABLISHED|RELATED|INVALID))*|NONE)</param>
</data>
</define>
<define name='tcpflags-type'>
<define name="tcpflags-type">
<data type="string">
<param name="pattern">((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)/((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)</param>
</data>
</define>
<define name='ipset-name-type'>
<define name="ipset-name-type">
<choice>
<ref name="variable-name-type"/>
<data type="string">
@ -978,7 +978,7 @@
</choice>
</define>
<define name='ipset-flags-type'>
<define name="ipset-flags-type">
<data type="string">
<param name="pattern">(src|dst)(,(src|dst)){0,5}</param>
</data>

View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!-- domain-related definitions used in multiple grammars -->
<include href='basictypes.rng'/>
<include href='nwfilter_params.rng'/>
<include href="basictypes.rng"/>
<include href="nwfilter_params.rng"/>
<start>
<ref name="filterbinding"/>

View File

@ -2,42 +2,42 @@
<!-- A Relax NG schema for the libvirt secret properties XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<start>
<ref name='secret'/>
<ref name="secret"/>
</start>
<include href='basictypes.rng'/>
<include href="basictypes.rng"/>
<define name='secret'>
<element name='secret'>
<define name="secret">
<element name="secret">
<optional>
<attribute name='ephemeral'>
<attribute name="ephemeral">
<ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<attribute name='private'>
<attribute name="private">
<ref name="virYesNo"/>
</attribute>
</optional>
<interleave>
<optional>
<element name='uuid'>
<ref name='UUID'/>
<element name="uuid">
<ref name="UUID"/>
</element>
</optional>
<optional>
<element name='description'>
<element name="description">
<text/>
</element>
</optional>
<optional>
<element name='usage'>
<element name="usage">
<choice>
<ref name='usagevolume'/>
<ref name='usageceph'/>
<ref name='usageiscsi'/>
<ref name='usagetls'/>
<ref name='usagevtpm'/>
<ref name="usagevolume"/>
<ref name="usageceph"/>
<ref name="usageiscsi"/>
<ref name="usagetls"/>
<ref name="usagevtpm"/>
<!-- More choices later -->
</choice>
</element>
@ -46,48 +46,48 @@
</element>
</define>
<define name='usagevolume'>
<attribute name='type'>
<define name="usagevolume">
<attribute name="type">
<value>volume</value>
</attribute>
<element name='volume'>
<ref name='absFilePath'/>
<element name="volume">
<ref name="absFilePath"/>
</element>
</define>
<define name='usageceph'>
<attribute name='type'>
<define name="usageceph">
<attribute name="type">
<value>ceph</value>
</attribute>
<element name='name'>
<ref name='genericName'/>
<element name="name">
<ref name="genericName"/>
</element>
</define>
<define name='usageiscsi'>
<attribute name='type'>
<define name="usageiscsi">
<attribute name="type">
<value>iscsi</value>
</attribute>
<element name='target'>
<ref name='genericName'/>
<element name="target">
<ref name="genericName"/>
</element>
</define>
<define name='usagetls'>
<attribute name='type'>
<define name="usagetls">
<attribute name="type">
<value>tls</value>
</attribute>
<element name='name'>
<ref name='genericName'/>
<element name="name">
<ref name="genericName"/>
</element>
</define>
<define name='usagevtpm'>
<attribute name='type'>
<define name="usagevtpm">
<attribute name="type">
<value>vtpm</value>
</attribute>
<element name='name'>
<ref name='genericName'/>
<element name="name">
<ref name="genericName"/>
</element>
</define>

View File

@ -14,9 +14,9 @@
</data>
</define>
<define name='encryption'>
<element name='encryption'>
<attribute name='format'>
<define name="encryption">
<element name="encryption">
<attribute name="format">
<choice>
<value>default</value>
<value>qcow</value>
@ -24,23 +24,23 @@
</choice>
</attribute>
<interleave>
<ref name='secret'/>
<ref name="secret"/>
<optional>
<element name='cipher'>
<ref name='keycipher'/>
<element name="cipher">
<ref name="keycipher"/>
</element>
<element name='ivgen'>
<ref name='keyivgen'/>
<element name="ivgen">
<ref name="keyivgen"/>
</element>
</optional>
</interleave>
</element>
</define>
<define name='initiatorinfo'>
<element name='initiator'>
<element name='iqn'>
<attribute name='name'>
<define name="initiatorinfo">
<element name="initiator">
<element name="iqn">
<attribute name="name">
<text/>
</attribute>
<empty/>
@ -61,7 +61,7 @@
</element>
</define>
<define name='unixSocketSource'>
<define name="unixSocketSource">
<element name="source">
<attribute name="type">
<value>unix</value>
@ -82,47 +82,47 @@
</element>
</define>
<define name='reservations'>
<element name='reservations'>
<define name="reservations">
<element name="reservations">
<optional>
<attribute name='managed'>
<ref name='virYesNo'/>
<attribute name="managed">
<ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<ref name='unixSocketSource'/>
<ref name="unixSocketSource"/>
</optional>
</element>
</define>
<define name='secret'>
<element name='secret'>
<attribute name='type'>
<define name="secret">
<element name="secret">
<attribute name="type">
<value>passphrase</value>
</attribute>
<choice>
<attribute name='uuid'>
<attribute name="uuid">
<ref name="UUID"/>
</attribute>
<attribute name='usage'>
<attribute name="usage">
<text/>
</attribute>
</choice>
</element>
</define>
<define name='compat'>
<element name='compat'>
<data type='string'>
<param name='pattern'>[0-9]+\.[0-9]+</param>
<define name="compat">
<element name="compat">
<data type="string">
<param name="pattern">[0-9]+\.[0-9]+</param>
</data>
</element>
</define>
<define name='fileFormatFeatures'>
<element name='features'>
<define name="fileFormatFeatures">
<element name="features">
<interleave>
<optional>
<element name='lazy_refcounts'>
<element name="lazy_refcounts">
<empty/>
</element>
</optional>
@ -132,7 +132,7 @@
<!-- split the list of known storage formats into two, those where
we know how to follow backing chains, and all others -->
<define name='storageFormatBacking'>
<define name="storageFormatBacking">
<choice>
<value>cow</value>
<value>qcow</value>
@ -141,7 +141,7 @@
<value>vmdk</value>
</choice>
</define>
<define name='storageFormat'>
<define name="storageFormat">
<choice>
<value>raw</value>
<value>dir</value>
@ -155,51 +155,51 @@
<value>vhd</value>
<value>ploop</value>
<value>luks</value>
<ref name='storageFormatBacking'/>
<ref name="storageFormatBacking"/>
</choice>
</define>
<define name='storageStartupPolicy'>
<!-- Use a combine='choice' override in client files that want to
<define name="storageStartupPolicy">
<!-- Use a combine="choice" override in client files that want to
add additional attributes to a <source> sub-element
associated with a storage source -->
<notAllowed/>
</define>
<define name='storageSourceExtra'>
<!-- Use a combine='choice' override in client files that want to
<define name="storageSourceExtra">
<!-- Use a combine="choice" override in client files that want to
add additional elements as siblings of a <source> sub-element
associated with a storage source -->
<notAllowed/>
</define>
<define name='permissions'>
<define name="permissions">
<optional>
<element name='permissions'>
<element name="permissions">
<interleave>
<optional>
<element name='mode'>
<ref name='octalMode'/>
<element name="mode">
<ref name="octalMode"/>
</element>
</optional>
<optional>
<element name='owner'>
<element name="owner">
<choice>
<ref name='unsignedInt'/>
<ref name="unsignedInt"/>
<value>-1</value>
</choice>
</element>
</optional>
<optional>
<element name='group'>
<element name="group">
<choice>
<ref name='unsignedInt'/>
<ref name="unsignedInt"/>
<value>-1</value>
</choice>
</element>
</optional>
<optional>
<element name='label'>
<element name="label">
<text/>
</element>
</optional>
@ -208,35 +208,35 @@
</optional>
</define>
<define name='keycipher'>
<attribute name='name'>
<define name="keycipher">
<attribute name="name">
<text/>
</attribute>
<attribute name='size'>
<attribute name="size">
<ref name="unsignedInt"/>
</attribute>
<optional>
<attribute name='mode'>
<attribute name="mode">
<text/>
</attribute>
<attribute name='hash'>
<attribute name="hash">
<text/>
</attribute>
</optional>
</define>
<define name='keyivgen'>
<attribute name='name'>
<define name="keyivgen">
<attribute name="name">
<text/>
</attribute>
<optional>
<attribute name='hash'>
<attribute name="hash">
<text/>
</attribute>
</optional>
</define>
<define name='refreshVolumeAllocation'>
<define name="refreshVolumeAllocation">
<choice>
<value>default</value>
<value>capacity</value>

File diff suppressed because it is too large Load Diff

View File

@ -1,85 +1,85 @@
<?xml version="1.0"?>
<!-- A Relax NG schema for the libvirt storage pool capabilities XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href='basictypes.rng'/>
<include href="basictypes.rng"/>
<start>
<ref name='storagepoolCapabilities'/>
<ref name="storagepoolCapabilities"/>
</start>
<define name='storagepoolCapabilities'>
<element name='storagepoolCapabilities'>
<define name="storagepoolCapabilities">
<element name="storagepoolCapabilities">
<zeroOrMore>
<ref name='poolCapsType'/>
<ref name="poolCapsType"/>
</zeroOrMore>
</element>
</define>
<define name='poolCapsType'>
<element name='pool'>
<ref name='poolCapsTypes'/>
<ref name='poolCapsSupported'/>
<define name="poolCapsType">
<element name="pool">
<ref name="poolCapsTypes"/>
<ref name="poolCapsSupported"/>
<optional>
<ref name='poolCapsPoolOptions'/>
<ref name="poolCapsPoolOptions"/>
</optional>
<optional>
<ref name='poolCapsVolOptions'/>
<ref name="poolCapsVolOptions"/>
</optional>
</element>
</define>
<define name='poolCapsTypes'>
<attribute name='type'>
<define name="poolCapsTypes">
<attribute name="type">
<text/>
</attribute>
</define>
<define name='poolCapsSupported'>
<attribute name='supported'>
<define name="poolCapsSupported">
<attribute name="supported">
<ref name="virYesNo"/>
</attribute>
</define>
<define name='poolCapsPoolOptions'>
<element name='poolOptions'>
<define name="poolCapsPoolOptions">
<element name="poolOptions">
<optional>
<ref name='poolDefaultFormat'/>
<ref name="poolDefaultFormat"/>
</optional>
<optional>
<ref name='poolCapsEnum'/>
<ref name="poolCapsEnum"/>
</optional>
</element>
</define>
<define name='poolCapsVolOptions'>
<element name='volOptions'>
<ref name='poolDefaultFormat'/>
<ref name='poolCapsEnum'/>
<define name="poolCapsVolOptions">
<element name="volOptions">
<ref name="poolDefaultFormat"/>
<ref name="poolCapsEnum"/>
</element>
</define>
<define name='poolDefaultFormat'>
<element name='defaultFormat'>
<attribute name='type'>
<define name="poolDefaultFormat">
<element name="defaultFormat">
<attribute name="type">
<text/>
</attribute>
</element>
</define>
<define name='poolCapsEnum'>
<define name="poolCapsEnum">
<zeroOrMore>
<element name='enum'>
<attribute name='name'>
<element name="enum">
<attribute name="name">
<text/>
</attribute>
<ref name='value'/>
<ref name="value"/>
</element>
</zeroOrMore>
</define>
<define name='value'>
<define name="value">
<zeroOrMore>
<element name='value'>
<element name="value">
<text/>
</element>
</zeroOrMore>

View File

@ -2,18 +2,18 @@
<!-- A Relax NG schema for the libvirt storage volume XML format -->
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href='basictypes.rng'/>
<include href="basictypes.rng"/>
<start>
<ref name='vol'/>
<ref name="vol"/>
</start>
<include href='storagecommon.rng'/>
<include href="storagecommon.rng"/>
<define name='vol'>
<element name='volume'>
<define name="vol">
<element name="volume">
<optional>
<attribute name='type'>
<attribute name="type">
<choice>
<value>file</value>
<value>block</value>
@ -24,68 +24,68 @@
</attribute>
</optional>
<interleave>
<element name='name'>
<ref name='volName'/>
<element name="name">
<ref name="volName"/>
</element>
<optional>
<element name='key'>
<element name="key">
<text/>
</element>
</optional>
<optional>
<ref name='source'/>
<ref name="source"/>
</optional>
<ref name='sizing'/>
<ref name='target'/>
<ref name="sizing"/>
<ref name="target"/>
<optional>
<ref name='backingStore'/>
<ref name="backingStore"/>
</optional>
</interleave>
</element>
</define>
<define name='sizing'>
<define name="sizing">
<interleave>
<optional>
<element name='capacity'>
<ref name='scaledInteger'/>
<element name="capacity">
<ref name="scaledInteger"/>
</element>
</optional>
<optional>
<element name='allocation'>
<ref name='scaledInteger'/>
<element name="allocation">
<ref name="scaledInteger"/>
</element>
</optional>
<optional>
<element name='physical'>
<ref name='scaledInteger'/>
<element name="physical">
<ref name="scaledInteger"/>
</element>
</optional>
</interleave>
</define>
<define name='timestamps'>
<define name="timestamps">
<optional>
<element name='timestamps'>
<element name="timestamps">
<interleave>
<optional>
<element name='atime'>
<ref name='timestamp'/>
<element name="atime">
<ref name="timestamp"/>
</element>
</optional>
<optional>
<element name='btime'>
<ref name='timestamp'/>
<element name="btime">
<ref name="timestamp"/>
</element>
</optional>
<optional>
<element name='ctime'>
<ref name='timestamp'/>
<element name="ctime">
<ref name="timestamp"/>
</element>
</optional>
<optional>
<element name='mtime'>
<ref name='timestamp'/>
<element name="mtime">
<ref name="timestamp"/>
</element>
</optional>
</interleave>
@ -93,92 +93,92 @@
</optional>
</define>
<define name='timestamp'>
<data type='string'>
<define name="timestamp">
<data type="string">
<param name="pattern">[0-9]+(\.[0-9]{0,9})?</param>
</data>
</define>
<define name='target'>
<element name='target'>
<define name="target">
<element name="target">
<interleave>
<optional>
<element name='path'>
<element name="path">
<choice>
<data type='anyURI'/>
<ref name='absFilePath'/>
<data type="anyURI"/>
<ref name="absFilePath"/>
</choice>
</element>
</optional>
<ref name='format'/>
<ref name='permissions'/>
<ref name='timestamps'/>
<ref name="format"/>
<ref name="permissions"/>
<ref name="timestamps"/>
<optional>
<ref name='encryption'/>
<ref name="encryption"/>
</optional>
<optional>
<ref name='compat'/>
<ref name="compat"/>
</optional>
<optional>
<element name='nocow'>
<element name="nocow">
<empty/>
</element>
</optional>
<optional>
<ref name='fileFormatFeatures'/>
<ref name="fileFormatFeatures"/>
</optional>
</interleave>
</element>
</define>
<define name='backingStore'>
<element name='backingStore'>
<define name="backingStore">
<element name="backingStore">
<interleave>
<element name='path'>
<ref name='absFilePath'/>
<element name="path">
<ref name="absFilePath"/>
</element>
<ref name='format'/>
<ref name='permissions'/>
<ref name='timestamps'/>
<ref name="format"/>
<ref name="permissions"/>
<ref name="timestamps"/>
</interleave>
</element>
</define>
<define name='source'>
<element name='source'>
<define name="source">
<element name="source">
<zeroOrMore>
<ref name='sourcedev'/>
<ref name="sourcedev"/>
</zeroOrMore>
</element>
</define>
<define name='sourcedev'>
<element name='device'>
<attribute name='path'>
<ref name='absFilePath'/>
<define name="sourcedev">
<element name="device">
<attribute name="path">
<ref name="absFilePath"/>
</attribute>
<choice>
<empty/>
<ref name='devextents'/>
<ref name="devextents"/>
</choice>
</element>
</define>
<define name='devextents'>
<define name="devextents">
<oneOrMore>
<element name='extent'>
<attribute name='start'>
<ref name='unsignedLong'/>
<element name="extent">
<attribute name="start">
<ref name="unsignedLong"/>
</attribute>
<attribute name='end'>
<ref name='unsignedLong'/>
<attribute name="end">
<ref name="unsignedLong"/>
</attribute>
</element>
</oneOrMore>
</define>
<define name='formatdev'>
<define name="formatdev">
<choice>
<value>none</value>
<value>auto</value>
@ -198,14 +198,14 @@
</choice>
</define>
<define name='formatfile'>
<define name="formatfile">
<choice>
<value>unknown</value>
<ref name='storageFormat'/>
<ref name="storageFormat"/>
</choice>
</define>
<define name='formatdisk'>
<define name="formatdisk">
<choice>
<value>none</value>
<value>linux</value>
@ -218,14 +218,14 @@
</choice>
</define>
<define name='format'>
<define name="format">
<optional>
<element name='format'>
<attribute name='type'>
<element name="format">
<attribute name="type">
<choice>
<ref name='formatfile'/>
<ref name='formatdev'/>
<ref name='formatdisk'/>
<ref name="formatfile"/>
<ref name="formatdev"/>
<ref name="formatdisk"/>
</choice>
</attribute>
</element>