[libvirt] [PATCH 1/4] schema: Add schema for disk <wwn>

[Paolo Bonzini]

Il 29/08/2012 18:36, Osier Yang ha scritto:
> * 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     |    5 +++++
>  docs/schemas/basictypes.rng   |    6 ++++++
>  docs/schemas/domaincommon.rng |    5 +++++
>  docs/schemas/nodedev.rng      |    6 ------
>  4 files changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
> index be8489a..202aa2b 100644
> --- a/docs/formatdomain.html.in
> +++ b/docs/formatdomain.html.in
> @@ -1550,6 +1550,11 @@
>            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 specify WWN of virtual hard drive. It must be

If present, this element specifies the WWN (World Wide Name) of a
virtual hard disk or CD-ROM drive.

> +        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 145caf7..d1f1082 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -886,6 +886,11 @@
>        <optional>
>          <ref name="geometry"/>
>        </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 good.

Paolo