[libvirt] [PATCH 1/1] Use a common xml type for ceph secret usage.
The types used in domaincommon.rng and secret.rng should be the same.
Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com>
---
docs/schemas/domaincommon.rng | 11 ++++++++---
docs/schemas/secret.rng | 4 +++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 3477351..d053489 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2558,13 +2558,13 @@
<attribute name='uuid'>
<ref name="UUID"/>
</attribute>
- <attribute name="usage">
- <ref name="genericName"/>
+ <attribute name='usage'>
+ <ref name='usageName'/>
</attribute>
</choice>
</element>
</define>
-
+
<!--
Optional hypervisor extensions in their own namespace:
QEmu
@@ -2675,6 +2675,11 @@
<param
name="pattern">(([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9])|(([0-9a-fA-F]+|:)+[0-9a-fA-F]+)|([a-zA-Z0-9_\.\+\-]*)</param>
</data>
</define>
+ <define name="usageName">
+ <data type="string">
+ <param name="pattern">[a-zA-Z0-9_\.\+\-]+</param>
+ </data>
+ </define>
<define name="usbId">
<data type="string">
<param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param>
diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng
index 8e7714b..3abd3c7 100644
--- a/docs/schemas/secret.rng
+++ b/docs/schemas/secret.rng
@@ -4,6 +4,8 @@
<ref name='secret'/>
</start>
+ <include href='domaincommon.rng'/>
+
<define name='secret'>
<element name='secret'>
<optional>
@@ -60,7 +62,7 @@
<value>ceph</value>
</attribute>
<element name='name'>
- <text/>
+ <ref name='usageName'/>
</element>
</define>
--
1.7.1