From dbb7df1f811ce069a29e0ab5a2ff77916a350ca3 Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Tue, 11 Sep 2012 16:57:01 +0800
Subject: [PATCH] schema: Add schema for disk <wwn>

* docs/formatdomain.html.in: Add document.
* docs/schemas/nodedev.rng: Move definition of "wwn" to ...
* docs/schemas/basictypes.rng: ...Here
* docs/schemas/domaincommon.rng: Add schema for disk <wwn>
---
 docs/formatdomain.html.in     | 6 ++++++
 docs/schemas/basictypes.rng   | 6 ++++++
 docs/schemas/domaincommon.rng | 5 +++++
 docs/schemas/nodedev.rng      | 6 ------
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index c05f3df9c9..8bdfbf1758 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1582,6 +1582,12 @@
           like <code>&lt;serial&gt;WD-WMAP9A966149&lt;/serial&gt;</code>.
           <span class="since">Since 0.7.1</span>
       </dd>
+      <dt><code>wwn</code></dt>
+      <dd>If present, this element specifies the WWN (World Wide Name)
+        of a virtual hard disk or CD-ROM drive. It must be composed
+        of 16 hexadecimal digits.
+        <span class='since'>Since 0.10.1</span>
+      </dd>
       <dt><code>host</code></dt>
       <dd>The <code>host</code> element has two attributes "name" and "port",
         which specify the hostname and the port number. The meaning of this
diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index 766f9a08f5..38cab16ce5 100644
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -213,4 +213,10 @@
     </data>
   </define>
 
+  <define name='wwn'>
+    <data type='string'>
+      <param name='pattern'>[0-9a-fA-F]{16}</param>
+    </data>
+  </define>
+
 </grammar>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index d70f0c25ef..aafb10c575 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -892,6 +892,11 @@
       <optional>
         <ref name="diskBlockIo"/>
       </optional>
+      <optional>
+        <element name="wwn">
+          <ref name="wwn"/>
+        </element>
+      </optional>
     </interleave>
   </define>
   <define name="snapshot">
diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
index 88a4e9ddc2..7c85815216 100644
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -245,12 +245,6 @@
     </attribute>
   </define>
 
-  <define name='wwn'>
-    <data type='string'>
-      <param name='pattern'>[0-9a-fA-F]{16}</param>
-    </data>
-  </define>
-
   <define name='capsfchost'>
     <attribute name='type'>
       <value>fc_host</value>