diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index bce38086d0..29b24edb4f 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5366,7 +5366,7 @@ qemu-kvm -net nic,model=? /dev/null
This listen type tells a graphics server to listen on unix socket.
Attribute socket
contains a path to unix socket. If this
attribute is omitted libvirt will generate this path for you.
- Supported by graphics type vnc
.
+ Supported by graphics type vnc
and spice
.
For vnc
graphics be backward compatible
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c7698b48cc..fedfb61c6f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10943,7 +10943,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
def->type = typeVal;
if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET &&
- graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
+ graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
+ graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("listen type 'socket' is not available for "
"graphics type '%s'"), graphicsType);
@@ -21924,18 +21925,28 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
break;
case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
- if (def->data.spice.port)
- virBufferAsprintf(buf, " port='%d'",
- def->data.spice.port);
+ switch (glisten->type) {
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
+ if (def->data.spice.port)
+ virBufferAsprintf(buf, " port='%d'",
+ def->data.spice.port);
- if (def->data.spice.tlsPort)
- virBufferAsprintf(buf, " tlsPort='%d'",
- def->data.spice.tlsPort);
+ if (def->data.spice.tlsPort)
+ virBufferAsprintf(buf, " tlsPort='%d'",
+ def->data.spice.tlsPort);
- virBufferAsprintf(buf, " autoport='%s'",
- def->data.spice.autoport ? "yes" : "no");
+ virBufferAsprintf(buf, " autoport='%s'",
+ def->data.spice.autoport ? "yes" : "no");
- virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
+ virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
+ break;
+
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
+ break;
+ }
if (def->data.spice.keymap)
virBufferEscapeString(buf, " keymap='%s'",
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 971f4048d9..21331b1e1f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7347,27 +7347,53 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
goto error;
}
- glisten = virDomainGraphicsGetListen(graphics, 0);
-
- if (port > 0) {
- virBufferAsprintf(&opt, "port=%u,", port);
- hasInsecure = true;
+ if (!(glisten = virDomainGraphicsGetListen(graphics, 0))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("missing listen element"));
+ goto error;
}
- if (tlsPort > 0) {
- if (!cfg->spiceTLS) {
+ switch (glisten->type) {
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_UNIX)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("spice TLS port set in XML configuration,"
- " but TLS is disabled in qemu.conf"));
+ _("unix socket for spice graphics are not supported "
+ "with this QEMU"));
goto error;
}
- virBufferAsprintf(&opt, "tls-port=%u,", tlsPort);
- hasSecure = true;
- }
- if (port > 0 || tlsPort > 0) {
- if (glisten && glisten->address)
- virBufferAsprintf(&opt, "addr=%s,", glisten->address);
+ virBufferAsprintf(&opt, "unix,addr=%s,", glisten->socket);
+ hasInsecure = true;
+ break;
+
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
+ if (port > 0) {
+ virBufferAsprintf(&opt, "port=%u,", port);
+ hasInsecure = true;
+ }
+
+ if (tlsPort > 0) {
+ if (!cfg->spiceTLS) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("spice TLS port set in XML configuration, "
+ "but TLS is disabled in qemu.conf"));
+ goto error;
+ }
+ virBufferAsprintf(&opt, "tls-port=%u,", tlsPort);
+ hasSecure = true;
+ }
+
+ if (port > 0 || tlsPort > 0) {
+ if (glisten->address)
+ virBufferAsprintf(&opt, "addr=%s,", glisten->address);
+ }
+
+ break;
+
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
+ break;
}
if (cfg->spiceSASL) {
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 38c07a827b..89350c89f4 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -315,17 +315,17 @@ qemuDomainExtractTLSSubject(const char *certdir)
static qemuMigrationCookieGraphicsPtr
qemuMigrationCookieGraphicsSpiceAlloc(virQEMUDriverPtr driver,
- virDomainGraphicsDefPtr def)
+ virDomainGraphicsDefPtr def,
+ virDomainGraphicsListenDefPtr glisten)
{
qemuMigrationCookieGraphicsPtr mig = NULL;
const char *listenAddr;
- virDomainGraphicsListenDefPtr glisten = virDomainGraphicsGetListen(def, 0);
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
if (VIR_ALLOC(mig) < 0)
goto error;
- mig->type = def->type;
+ mig->type = VIR_DOMAIN_GRAPHICS_TYPE_SPICE;
mig->port = def->data.spice.port;
if (cfg->spiceTLS)
mig->tlsPort = def->data.spice.tlsPort;
@@ -452,14 +452,39 @@ qemuMigrationCookieAddGraphics(qemuMigrationCookiePtr mig,
}
for (i = 0; i < dom->def->ngraphics; i++) {
- if (dom->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
- if (!(mig->graphics =
- qemuMigrationCookieGraphicsSpiceAlloc(driver,
- dom->def->graphics[i])))
- return -1;
- mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS;
- break;
- }
+ if (dom->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
+ virDomainGraphicsListenDefPtr glisten =
+ virDomainGraphicsGetListen(dom->def->graphics[i], 0);
+
+ if (!glisten) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("missing listen element"));
+ return -1;
+ }
+
+ switch (glisten->type) {
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
+ /* Seamless migration is supported only for listen types
+ * 'address and 'network'. */
+ if (!(mig->graphics =
+ qemuMigrationCookieGraphicsSpiceAlloc(driver,
+ dom->def->graphics[i],
+ glisten)))
+ return -1;
+ mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS;
+ break;
+
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
+ break;
+ }
+
+ /* Seamless migration is supported only for one graphics. */
+ if (mig->graphics)
+ break;
+ }
}
return 0;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args
new file mode 100644
index 0000000000..61335b0460
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args
@@ -0,0 +1,20 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=spice \
+/usr/bin/qemu \
+-name QEMUGuest1 \
+-S \
+-M pc \
+-m 214 \
+-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nodefaults \
+-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
+-no-acpi \
+-boot c \
+-usb \
+-spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock \
+-vga cirrus
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.xml
new file mode 100644
index 0000000000..acb325ae1b
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.xml
@@ -0,0 +1,30 @@
+