aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLaine Stump <laine@laine.org>2012-08-12 12:01:32 -0400
committerLaine Stump <laine@laine.org>2012-08-15 13:10:57 -0400
commite4a199a1af85e075a62e2574ceca656356990a9a (patch)
treed88e1f9c73eeed09f9c5436e8cf41cd0278cd327 /docs
parentutil: include memory.h even if WITH_VIRTUALPORT isn't defined (diff)
downloadlibvirt-e4a199a1af85e075a62e2574ceca656356990a9a.tar.gz
libvirt-e4a199a1af85e075a62e2574ceca656356990a9a.tar.bz2
libvirt-e4a199a1af85e075a62e2574ceca656356990a9a.zip
schema: fix some problems in network/interface schemas
<portgroup> allows a <bandwidth> element, but the schema didn't have this. Since this makes for multiple elements in portgroup, they must be interleaved. <interface type='bridge'> needs to allow <virtualport> elements for openvswitch, but the schema didn't allow this.
Diffstat (limited to 'docs')
-rw-r--r--docs/schemas/domaincommon.rng3
-rw-r--r--docs/schemas/network.rng11
2 files changed, 11 insertions, 3 deletions
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 1b94155ac..767fccda0 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1410,6 +1410,9 @@
<empty/>
</element>
</optional>
+ <optional>
+ <ref name="virtualPortProfile"/>
+ </optional>
<ref name="interface-options"/>
</interleave>
</group>
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 25df26686..124c9f982 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -133,9 +133,14 @@
</choice>
</attribute>
</optional>
- <optional>
- <ref name="virtualPortProfile"/>
- </optional>
+ <interleave>
+ <optional>
+ <ref name="virtualPortProfile"/>
+ </optional>
+ <optional>
+ <ref name="bandwidth"/>
+ </optional>
+ </interleave>
</element>
</zeroOrMore>