[libvirt] [PATCH v2 1/2] Update structure & XML definitions to support <hostdev caps=net>

[Daniel P. Berrange]

On Fri, Apr 05, 2013 at 08:26:39AM -0400, Bogdan Purcareata wrote:
> This updates the definitions and supporting structures in the XML
> schema and domain configuration files.
> 
> Signed-off-by: Bogdan Purcareata <bogdan.purcareata at freescale.com>
> ---
>  docs/formatdomain.html.in     | 15 +++++++++++++--
>  docs/schemas/domaincommon.rng | 14 ++++++++++++++
>  src/conf/domain_conf.c        | 28 +++++++++++++++++++++++++++-
>  src/conf/domain_conf.h        |  4 ++++
>  4 files changed, 58 insertions(+), 3 deletions(-)
> 
> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
> index cf382e8..d0654a5 100644
> --- a/docs/formatdomain.html.in
> +++ b/docs/formatdomain.html.in
> @@ -2326,18 +2326,29 @@
>  ...
>      </pre>
>  
> +...
> +<hostdev mode='capabilities' type='net'>
> +  <source>
> +    <interface>eth0</interface>
> +  </source>
> +</hostdev>
> +...
> +    </pre>
> +
>      <dl>
>        <dt><code>hostdev</code></dt>
>        <dd>The <code>hostdev</code> element is the main container for describing
>          host devices. For block/character device passthrough <code>mode</code> is
>          always "capabilities" and <code>type</code> is "block" for a block
> -        device and "char" for a character device.
> +        device, "char" for a character device and "iface" for a host network
> +        interface.
>        </dd>
>        <dt><code>source</code></dt>
>        <dd>The source element describes the device as seen from the host.
>          For block devices, the path to the block device in the host
>          OS is provided in the nested "block" element, while for character
> -        devices the "char" element is used
> +        devices the "char" element is used. For network interfaces, the
> +        name of the interface is provided in the "iface" element.
>        </dd>
>      </dl>
>  
> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
> index 454ebdb..73e953f 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -2956,6 +2956,9 @@
>        <group>
>          <ref name="hostdevcapsmisc"/>
>        </group>
> +      <group>
> +        <ref name="hostdevcapsnet"/>
> +      </group>
>      </choice>
>    </define>
>  
> @@ -3016,6 +3019,17 @@
>      </element>
>    </define>
>  
> +  <define name="hostdevcapsnet">
> +    <attribute name="type">
> +      <value>net</value>
> +    </attribute>
> +    <element name="source">
> +      <element name="iface">

Opps, I didn't mean for you to change the XML schema to use 'iface' too,
only the C variable names. I've put this back to 'interface' (and the
other relevant places too.

ACK & merged to GIT

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|