6:34 a.m.
capability.rng: Guest features can be in any order.
nodedev.rng: Added <driver> element, <capability> phys_function and
virt_functions for PCI devices.
storagepool.rng: Owner or group ID can be -1.
---
docs/schemas/capability.rng | 76 +++++++++++++++++++++--------------------
docs/schemas/nodedev.rng | 37 ++++++++++++++++++++
docs/schemas/storagepool.rng | 4 +-
3 files changed, 78 insertions(+), 39 deletions(-)
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 06ff685..c392e44 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -296,43 +296,45 @@
<define name='features'>
<element name='features'>
- <optional>
- <element name='pae'>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name='nonpae'>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name='ia64_be'>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name='acpi'>
- <ref name='featuretoggle'/>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name='apic'>
- <ref name='featuretoggle'/>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name='cpuselection'>
- <empty/>
- </element>
- </optional>
- <optional>
- <element name='deviceboot'>
- <empty/>
- </element>
- </optional>
+ <interleave>
+ <optional>
+ <element name='pae'>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name='nonpae'>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name='ia64_be'>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name='acpi'>
+ <ref name='featuretoggle'/>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name='apic'>
+ <ref name='featuretoggle'/>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name='cpuselection'>
+ <empty/>
+ </element>
+ </optional>
+ <optional>
+ <element name='deviceboot'>
+ <empty/>
+ </element>
+ </optional>
+ </interleave>
</element>
</define>
diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
index a73c2e5..c07a97d 100644
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -15,6 +15,12 @@
<element name="parent"><text/></element>
</optional>
+ <optional>
+ <element name="driver">
+ <element name="name"><text/></element>
+ </element>
+ </optional>
+
<zeroOrMore>
<ref name="capability"/>
</zeroOrMore>
@@ -115,6 +121,28 @@
</choice>
</element>
+ <optional>
+ <element name='capability'>
+ <attribute name='type'>
+ <value>phys_function</value>
+ </attribute>
+ <optional>
+ <ref name='address'/>
+ </optional>
+ </element>
+ </optional>
+
+ <optional>
+ <element name='capability'>
+ <attribute name='type'>
+ <value>virt_functions</value>
+ </attribute>
+ <optional>
+ <ref name='address'/>
+ </optional>
+ </element>
+ </optional>
+
</define>
<define name='capusbdev'>
@@ -369,6 +397,15 @@
</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>
+ </element>
+ </define>
+
<define name='hexuint'>
<data type='string'>
<param name="pattern">(0x)?[0-9a-f]+</param>
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 039798a..8d33f70 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -178,10 +178,10 @@
<ref name='unsignedInt'/>
</element>
<element name='owner'>
- <ref name='unsignedInt'/>
+ <data type='int'/>
</element>
<element name='group'>
- <ref name='unsignedInt'/>
+ <data type='int'/>
</element>
<optional>
<element name='label'>
--
1.7.8.6