[libvirt] [PATCH 1/4] schema: Add schema for disk <wwn>
Daniel Veillard
veillard at redhat.com
Tue Sep 18 05:37:38 UTC 2012
On Tue, Sep 18, 2012 at 10:47:09AM +0800, Osier Yang wrote:
> * 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 c05f3df..8bdfbf1 100644
> --- a/docs/formatdomain.html.in
> +++ b/docs/formatdomain.html.in
> @@ -1582,6 +1582,12 @@
> like <code><serial>WD-WMAP9A966149</serial></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 766f9a0..38cab16 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 d70f0c2..aafb10c 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 88a4e9d..7c85815 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>
Looks fine, ACK,
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel at veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
More information about the libvir-list
mailing list