[libvirt] [PATCH v2 2/2] domain_conf: add "default" to list of valid spice channels

[Eric Blake]

On 05/08/2012 07:00 AM, Alon Levy wrote:
> qemu's behavior in this case is to change the spice server behavior to
> require secure connection to any channel not otherwise specified as
> being in plaintext mode. libvirt doesn't currently allow requesting this
> (via plaintext-channel=<channel name>).
> 
> RHBZ: 819499
> 
> Signed-off-by: Alon Levy <alevy at redhat.com>
> ---
>  docs/formatdomain.html.in                               |    5 +++--
>  docs/schemas/domaincommon.rng                           |    1 +
>  src/conf/domain_conf.c                                  |    1 +
>  src/conf/domain_conf.h                                  |    1 +
>  tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args |    2 +-
>  tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml  |    1 +
>  6 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
> index 0525577..9758f73 100644
> --- a/docs/formatdomain.html.in
> +++ b/docs/formatdomain.html.in
> @@ -2940,8 +2940,9 @@ qemu-kvm -net nic,model=? /dev/null
>                <code>inputs</code>, <code>cursor</code>,
>                <code>playback</code>, <code>record</code>;
>                <span class="since">since
> -              0.8.8</span>: <code>smartcard</code> and <span class="since">
> -              since 0.9.12</span> <code>usbredir</code>.
> +              0.8.8</span>: <code>smartcard</code>, <span class="since">
> +              since 0.9.12</span> <code>usbredir</code> and
> +              <code>default</code>.

I decided to keep your approach of having default appear as a channel
rather than a meta-annotation on the parent element (if only so that
native-to-xml parsing is easier), but also thought that additional
wording in the documentatino would help:


diff --git c/docs/formatdomain.html.in i/docs/formatdomain.html.in
index 1ccf7a3..4defcf1 100644
--- c/docs/formatdomain.html.in
+++ i/docs/formatdomain.html.in
@@ -2942,7 +2942,10 @@ qemu-kvm -net nic,model=? /dev/null
               (all <span class="since"> since 0.8.6</span>);
               <code>smartcard</code> (<span class="since">since
               0.8.8</span>); and <code>usbredir</code>
-              (<span class="since">since 0.9.12</span>).
+              and <code>default</code> (<span class="since">since
+              0.9.12</span>).  The <code>default</code> channel is not
+              an actual channel, but specifies the settings for all
+              other channels not explicitly listed.
             </p>
             <pre>
   <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'>


ACK with that tweak.  However, since I spoke with you on IRC about the
possibility of an alternate implementation
(https://www.redhat.com/archives/libvir-list/2012-May/msg00393.html),
I'll wait to push until we can compare the two ideas.  I'm sure that
treating 'default' as a special case will be more lines of code, but
might make the end-result XML more legible.

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120508/51bb8d21/attachment-0001.sig>