|
 |
9119d9 |
From 375c93d2f57b7620299c856e60207507ef28f552 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <375c93d2f57b7620299c856e60207507ef28f552@dist-git>
|
|
|
9119d9 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
Date: Wed, 24 Sep 2014 16:55:41 +0200
|
|
|
9119d9 |
Subject: [PATCH] schemas: finish virTristate{Bool, Switch} transition
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1139364
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit f864aac90bcc029584c9cc847ce36fdc108baad9)
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
docs/schemas/basictypes.rng | 19 ++++--
|
|
|
9119d9 |
docs/schemas/capability.rng | 10 +--
|
|
|
9119d9 |
docs/schemas/domaincaps.rng | 5 +-
|
|
|
9119d9 |
docs/schemas/domaincommon.rng | 155 +++++++++---------------------------------
|
|
|
9119d9 |
docs/schemas/interface.rng | 19 +-----
|
|
|
9119d9 |
docs/schemas/network.rng | 29 ++------
|
|
|
9119d9 |
docs/schemas/nwfilter.rng | 5 +-
|
|
|
9119d9 |
docs/schemas/secret.rng | 10 +--
|
|
|
9119d9 |
8 files changed, 61 insertions(+), 191 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
|
|
|
9119d9 |
index 75d5238..14245c9 100644
|
|
|
9119d9 |
--- a/docs/schemas/basictypes.rng
|
|
|
9119d9 |
+++ b/docs/schemas/basictypes.rng
|
|
|
9119d9 |
@@ -77,10 +77,7 @@
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="multifunction">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
@@ -446,4 +443,18 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
|
|
|
9119d9 |
+ <define name="virYesNo">
|
|
|
9119d9 |
+ <choice>
|
|
|
9119d9 |
+ <value>yes</value>
|
|
|
9119d9 |
+ <value>no</value>
|
|
|
9119d9 |
+ </choice>
|
|
|
9119d9 |
+ </define>
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ <define name="virOnOff">
|
|
|
9119d9 |
+ <choice>
|
|
|
9119d9 |
+ <value>on</value>
|
|
|
9119d9 |
+ <value>off</value>
|
|
|
9119d9 |
+ </choice>
|
|
|
9119d9 |
+ </define>
|
|
|
9119d9 |
+
|
|
|
9119d9 |
</grammar>
|
|
|
9119d9 |
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
|
|
|
9119d9 |
index f954599..5f3ec70 100644
|
|
|
9119d9 |
--- a/docs/schemas/capability.rng
|
|
|
9119d9 |
+++ b/docs/schemas/capability.rng
|
|
|
9119d9 |
@@ -405,16 +405,10 @@
|
|
|
9119d9 |
|
|
|
9119d9 |
<define name='featuretoggle'>
|
|
|
9119d9 |
<attribute name='toggle'>
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<attribute name='default'>
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
|
|
|
9119d9 |
index f4a555f..35d3745 100644
|
|
|
9119d9 |
--- a/docs/schemas/domaincaps.rng
|
|
|
9119d9 |
+++ b/docs/schemas/domaincaps.rng
|
|
|
9119d9 |
@@ -98,10 +98,7 @@
|
|
|
9119d9 |
|
|
|
9119d9 |
<define name='supported'>
|
|
|
9119d9 |
<attribute name='supported'>
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
|
|
|
9119d9 |
index badc17b..19dc82f 100644
|
|
|
9119d9 |
--- a/docs/schemas/domaincommon.rng
|
|
|
9119d9 |
+++ b/docs/schemas/domaincommon.rng
|
|
|
9119d9 |
@@ -118,10 +118,7 @@
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name='relabel'>
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
@@ -282,10 +279,7 @@
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<element name="bootmenu">
|
|
|
9119d9 |
<attribute name="enable">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="timeout">
|
|
|
9119d9 |
@@ -584,10 +578,7 @@
|
|
|
9119d9 |
<ref name='scaledInteger'/>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="dumpCore">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -1012,10 +1003,7 @@
|
|
|
9119d9 |
</choice>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="present">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<empty/>
|
|
|
9119d9 |
@@ -1265,10 +1253,7 @@
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="rawio">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
@@ -1536,10 +1521,7 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="removable">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -1672,26 +1654,17 @@
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
<define name="ioeventfd">
|
|
|
9119d9 |
<attribute name="ioeventfd">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
<define name="event_idx">
|
|
|
9119d9 |
<attribute name="event_idx">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
<define name="copy_on_read">
|
|
|
9119d9 |
<attribute name='copy_on_read'>
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
<define name="discard">
|
|
|
9119d9 |
@@ -2222,20 +2195,14 @@
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="managed">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
<element name="source">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="missing">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<choice>
|
|
|
9119d9 |
@@ -2468,10 +2435,7 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="fullscreen">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</group>
|
|
|
9119d9 |
@@ -2488,10 +2452,7 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="autoport">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
@@ -2562,10 +2523,7 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="autoport">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
@@ -2674,10 +2632,7 @@
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<element name="playback">
|
|
|
9119d9 |
<attribute name="compression">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<empty/>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -2697,10 +2652,7 @@
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<element name="clipboard">
|
|
|
9119d9 |
<attribute name="copypaste">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<empty/>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -2719,10 +2671,7 @@
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<element name="filetransfer">
|
|
|
9119d9 |
<attribute name="enable">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<empty/>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -2740,26 +2689,17 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="autoport">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="replaceUser">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="multiUser">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
@@ -2780,10 +2720,7 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="fullscreen">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</group>
|
|
|
9119d9 |
@@ -2862,28 +2799,19 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="primary">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<element name="acceleration">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="accel3d">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="accel2d">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -3009,10 +2937,7 @@
|
|
|
9119d9 |
<define name="suspendChoices">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="enabled">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
@@ -3104,10 +3029,7 @@
|
|
|
9119d9 |
<define name="usbdevfilter">
|
|
|
9119d9 |
<element name="usbdev">
|
|
|
9119d9 |
<attribute name="allow">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="class">
|
|
|
9119d9 |
@@ -3567,10 +3489,7 @@
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="managed">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<choice>
|
|
|
9119d9 |
@@ -3910,10 +3829,7 @@
|
|
|
9119d9 |
<element name="apic">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="eoi">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -4215,10 +4131,7 @@
|
|
|
9119d9 |
<element name="bios">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="useserial">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
@@ -4288,10 +4201,7 @@
|
|
|
9119d9 |
<element name="rom">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="bar">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
@@ -4761,10 +4671,7 @@
|
|
|
9119d9 |
|
|
|
9119d9 |
<define name="featurestate">
|
|
|
9119d9 |
<attribute name="state">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</define>
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng
|
|
|
9119d9 |
index 0f577d6..d78f877 100644
|
|
|
9119d9 |
--- a/docs/schemas/interface.rng
|
|
|
9119d9 |
+++ b/docs/schemas/interface.rng
|
|
|
9119d9 |
@@ -127,7 +127,7 @@
|
|
|
9119d9 |
<element name="bridge">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="stp">
|
|
|
9119d9 |
- <ref name="on-or-off"/>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
|
|
|
9119d9 |
@@ -376,7 +376,7 @@
|
|
|
9119d9 |
<element name="dhcp">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="peerdns">
|
|
|
9119d9 |
- <ref name="yes-or-no"/>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</element>
|
|
|
9119d9 |
@@ -415,21 +415,6 @@
|
|
|
9119d9 |
instead of destination and nexthop instead of gateway.
|
|
|
9119d9 |
-->
|
|
|
9119d9 |
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- <define name="on-or-off">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
- </define>
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- <define name="yes-or-no">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
- </define>
|
|
|
9119d9 |
-
|
|
|
9119d9 |
|
|
|
9119d9 |
|
|
|
9119d9 |
<define name="timeval">
|
|
|
9119d9 |
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
|
|
|
9119d9 |
index 0e7da89..d84ccc0 100644
|
|
|
9119d9 |
--- a/docs/schemas/network.rng
|
|
|
9119d9 |
+++ b/docs/schemas/network.rng
|
|
|
9119d9 |
@@ -21,12 +21,9 @@
|
|
|
9119d9 |
with no gateways addresses specified -->
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="ipv6">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
- </attribute>
|
|
|
9119d9 |
- </optional>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
+ </attribute>
|
|
|
9119d9 |
+ </optional>
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
|
|
|
9119d9 |
|
|
|
9119d9 |
@@ -53,10 +50,7 @@
|
|
|
9119d9 |
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="stp">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>on</value>
|
|
|
9119d9 |
- <value>off</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virOnOff"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
|
|
|
9119d9 |
@@ -104,10 +98,7 @@
|
|
|
9119d9 |
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="managed">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
@@ -203,10 +194,7 @@
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="default">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
@@ -236,10 +224,7 @@
|
|
|
9119d9 |
<element name="dns">
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="forwardPlainNames">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng
|
|
|
9119d9 |
index f1aa699..2b54fd5 100644
|
|
|
9119d9 |
--- a/docs/schemas/nwfilter.rng
|
|
|
9119d9 |
+++ b/docs/schemas/nwfilter.rng
|
|
|
9119d9 |
@@ -377,10 +377,7 @@
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name="match">
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
</interleave>
|
|
|
9119d9 |
diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng
|
|
|
9119d9 |
index d7b8f83..e21e700 100644
|
|
|
9119d9 |
--- a/docs/schemas/secret.rng
|
|
|
9119d9 |
+++ b/docs/schemas/secret.rng
|
|
|
9119d9 |
@@ -11,18 +11,12 @@
|
|
|
9119d9 |
<element name='secret'>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name='ephemeral'>
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<optional>
|
|
|
9119d9 |
<attribute name='private'>
|
|
|
9119d9 |
- <choice>
|
|
|
9119d9 |
- <value>yes</value>
|
|
|
9119d9 |
- <value>no</value>
|
|
|
9119d9 |
- </choice>
|
|
|
9119d9 |
+ <ref name="virYesNo"/>
|
|
|
9119d9 |
</attribute>
|
|
|
9119d9 |
</optional>
|
|
|
9119d9 |
<interleave>
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.1
|
|
|
9119d9 |
|