From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 23 Mar 2012 10:04:13 +0000 (+0100)
Subject: Set default name for SPICE agent channel
X-Git-Tag: v0.9.11-rc2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0e2bb33;p=thirdparty%2Flibvirt.git

Set default name for SPICE agent channel

libvirt documentation for channels with type 'spicevmc' says that the
'target' child node has:
"an optional attribute name controls how the guest will have access
 to the channel, and defaults to name='com.redhat.spice.0'."

However, this default value is never set in libvirt code base,
there's only a check in qemu_command.c to error out if the name
attribute doesn't have the expected value (if it's set).

This commit sets a default target name for spicevmc channels during
the domain configuration parsing so that the code agrees with the
documentation.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ea558bbcef..24e10e6ecc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5248,6 +5248,13 @@ virDomainChrDefParseXML(virCapsPtr caps,
             goto error;
         } else {
             def->source.data.spicevmc = VIR_DOMAIN_CHR_SPICEVMC_VDAGENT;
+            if (!def->target.name) {
+                def->target.name = strdup("com.redhat.spice.0");
+                if (!def->target.name) {
+                    virReportOOMError();
+                    goto error;
+                }
+            }
         }
     }