6:35 a.m.
Introduce a new listen type that will be used to tell a graphics device
to listen on unix socket and use it for VNC graphics instead of socket
attribute. The socket attribute will remain in the XML for backward
compatibility.
Since old libvirt supports 'socket' attribute inside 'graphics' element
for socket path provided by user libvirt will generate migratable XML
without that listen type='socket' but only with 'socket' attribute in
order to be able to migrate back to old libvirt.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
docs/formatdomain.html.in | 16 +++
docs/schemas/domaincommon.rng | 10 ++
src/conf/domain_conf.c | 152 ++++++++++++++++++---
src/conf/domain_conf.h | 8 +-
src/libvirt_private.syms | 1 +
src/qemu/qemu.conf | 6 +-
src/qemu/qemu_command.c | 58 ++++----
src/qemu/qemu_domain.c | 28 ++--
src/qemu/qemu_hotplug.c | 9 ++
src/qemu/qemu_parse_command.c | 2 +-
src/qemu/qemu_process.c | 45 ++++--
src/security/virt-aa-helper.c | 15 +-
...ric-graphics-vnc-socket-attr-listen-address.xml | 30 ++++
...hics-vnc-socket-attr-listen-socket-mismatch.xml | 30 ++++
...eric-graphics-vnc-socket-attr-listen-socket.xml | 30 ++++
...ric-graphics-vnc-socket-attr-listen-address.xml | 30 ++++
...eric-graphics-vnc-socket-attr-listen-socket.xml | 30 ++++
.../generic-graphics-vnc-socket-listen.xml | 4 +-
.../generic-graphics-vnc-socket.xml | 4 +-
tests/genericxml2xmltest.c | 4 +
.../qemuargv2xml-graphics-vnc-socket.xml | 4 +-
.../qemuxml2argv-graphics-vnc-auto-socket.args | 20 +++
.../qemuxml2argv-graphics-vnc-auto-socket.xml | 30 ++++
.../qemuxml2argv-graphics-vnc-socket.args | 4 +-
.../qemuxml2argv-graphics-vnc-socket.xml | 10 +-
tests/qemuxml2argvtest.c | 2 +
.../qemuxml2xmlout-graphics-vnc-auto-socket.xml | 35 +++++
...graphics-vnc-remove-generated-socket-active.xml | 4 +-
.../qemuxml2xmlout-graphics-vnc-socket.xml | 35 +++++
tests/qemuxml2xmltest.c | 2 +
30 files changed, 564 insertions(+), 94 deletions(-)
create mode 100644
tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
create mode 100644
tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
create mode 100644
tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
create mode 100644
tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
create mode 100644
tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 1336c82..3b0febc 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5343,6 +5343,22 @@ qemu-kvm -net nic,model=? /dev/null
of the first forward dev will be used.
</p>
</dd>
+ <dt><code>socket</code> <span class="since">since
1.3.5</span></dt>
+ <dd>
+ <p>
+ This listen type tells a graphics server to listen on unix socket.
+ Attribute <code>socket</code> contains a path to unix socket. If
this
+ attribute is omitted libvirt will generate this path for you.
+ Supported by graphics type <code>vnc</code>.
+ </p>
+ <p>
+ For <code>vnc</code> graphics be backward compatible
+ the <code>socket</code> attribute of first
<code>listen</code> element
+ is duplicated as <code>socket</code> attribute in
<code>graphics</code>
+ element. If <code>graphics</code> element contains a
<code>socket</code>
+ attribute all <code>listen</code> elements are ignored.
+ </p>
+ </dd>
</dl>
<h4><a name="elementsVideo">Video devices</a></h4>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 903fd7e..60f9f52 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2971,6 +2971,16 @@
</attribute>
</optional>
</group>
+ <group>
+ <attribute name="type">
+ <value>socket</value>
+ </attribute>
+ <optional>
+ <attribute name="socket">
+ <ref name="absFilePath"/>
+ </attribute>
+ </optional>
+ </group>
</choice>
</element>
</zeroOrMore>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b3b60f1..c635238 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -561,7 +561,8 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST,
VIR_ENUM_IMPL(virDomainGraphicsListen, VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST,
"none",
"address",
- "network")
+ "network",
+ "socket")
VIR_ENUM_IMPL(virDomainGraphicsAuthConnected,
VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST,
@@ -1229,6 +1230,7 @@ virDomainGraphicsListenDefClear(virDomainGraphicsListenDefPtr def)
VIR_FREE(def->address);
VIR_FREE(def->network);
+ VIR_FREE(def->socket);
return;
}
@@ -1242,7 +1244,6 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def)
switch (def->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
- VIR_FREE(def->data.vnc.socket);
VIR_FREE(def->data.vnc.keymap);
virDomainGraphicsAuthDefClear(&def->data.vnc.auth);
break;
@@ -10660,6 +10661,7 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node,
* virDomainGraphicsListenDefParseXML:
* @def: listen def pointer to be filled
* @node: xml node of <listen/> element
+ *
* @parent: xml node of <graphics/> element
* @flags: bit-wise or of VIR_DOMAIN_DEF_PARSE_*
*
@@ -10671,6 +10673,7 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node,
static int
virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
xmlNodePtr node,
+ virDomainGraphicsDefPtr graphics,
xmlNodePtr parent,
unsigned int flags)
{
@@ -10678,12 +10681,17 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr
def,
char *type = virXMLPropString(node, "type");
char *address = virXMLPropString(node, "address");
char *network = virXMLPropString(node, "network");
+ char *socket = virXMLPropString(node, "socket");
char *fromConfig = virXMLPropString(node, "fromConfig");
char *addressCompat = NULL;
+ char *socketCompat = NULL;
+ const char *graphicsType = virDomainGraphicsTypeToString(graphics->type);
int tmp, typeVal;
- if (parent)
+ if (parent) {
addressCompat = virXMLPropString(parent, "listen");
+ socketCompat = virXMLPropString(parent, "socket");
+ }
if (!type) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -10698,6 +10706,14 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr
def,
}
def->type = typeVal;
+ if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET &&
+ graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("listen type 'socket' is not available for "
+ "graphics type '%s'"), graphicsType);
+ goto error;
+ }
+
if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) {
if (address && addressCompat && STRNEQ(address, addressCompat))
{
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -10713,6 +10729,21 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr
def,
}
}
+ if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) {
+ if (socket && socketCompat && STRNEQ(socket, socketCompat)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("graphics 'socket' attribute '%s' must
match "
+ "'socket' attribute of first listen element
"
+ "(found '%s')"), socketCompat, socket);
+ goto error;
+ }
+
+ if (!socket) {
+ socket = socketCompat;
+ socketCompat = NULL;
+ }
+ }
+
if (address && address[0] &&
(def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS ||
(def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK &&
@@ -10732,6 +10763,17 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr
def,
network = NULL;
}
+ if (socket && socket[0]) {
+ if (def->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("'socket' attribute is valid only for listen
"
+ "type 'socket'"));
+ goto error;
+ }
+ def->socket = socket;
+ socket = NULL;
+ }
+
if (fromConfig &&
flags & VIR_DOMAIN_DEF_PARSE_STATUS) {
if (virStrToLong_i(fromConfig, NULL, 10, &tmp) < 0) {
@@ -10750,8 +10792,10 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr
def,
VIR_FREE(type);
VIR_FREE(address);
VIR_FREE(network);
+ VIR_FREE(socket);
VIR_FREE(fromConfig);
VIR_FREE(addressCompat);
+ VIR_FREE(socketCompat);
return ret;
}
@@ -10771,12 +10815,6 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
ctxt->node = node;
- if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
- (socketPath = virXMLPropString(node, "socket"))) {
- ret = 0;
- goto error;
- }
-
/* parse the <listen> subelements for graphics types that support it */
nListens = virXPathNodeSet("./listen", ctxt, &listenNodes);
if (nListens < 0)
@@ -10791,6 +10829,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
for (i = 0; i < nListens; i++) {
if (virDomainGraphicsListenDefParseXML(&def->listens[i],
listenNodes[i],
+ def,
i == 0 ? node : NULL,
flags) < 0)
goto error;
@@ -10798,16 +10837,43 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
def->nListens++;
}
VIR_FREE(listenNodes);
+ }
+
+ /* If no <listen/> element was found in XML for backward compatibility
+ * we should try to parse 'listen' or 'socket' attribute from
<graphics/>
+ * element. */
+ if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC)
+ socketPath = virXMLPropString(node, "socket");
+
+ if (socketPath) {
+ newListen.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET;
+ newListen.socket = socketPath;
+ socketPath = NULL;
} else {
- /* If no <listen/> element was found in XML for backward compatibility
- * we should try to parse 'listen' attribute from <graphics/>
element. */
newListen.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS;
newListen.address = virXMLPropString(node, "listen");
if (STREQ_NULLABLE(newListen.address, ""))
VIR_FREE(newListen.address);
+ }
+ /* If no <listen/> element was found add a new one created by parsing
+ * <graphics/> element. */
+ if (def->nListens == 0) {
if (VIR_APPEND_ELEMENT(def->listens, def->nListens, newListen) < 0)
goto error;
+ } else {
+ virDomainGraphicsListenDefPtr glisten = &def->listens[0];
+
+ /* If the first <listen/> element is 'address' or 'network'
and we found
+ * 'socket' attribute inside <graphics/> element for backward
+ * compatibility we need to replace the first listen by
+ * <listen type='socket' .../> element based on the
'socket' attribite. */
+ if ((glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS ||
+ glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK) &&
+ newListen.type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) {
+ virDomainGraphicsListenDefClear(glisten);
+ *glisten = newListen;
+ }
}
ret = 0;
@@ -10885,7 +10951,6 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
}
}
- def->data.vnc.socket = virXMLPropString(node, "socket");
def->data.vnc.keymap = virXMLPropString(node, "keymap");
if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth,
@@ -21390,6 +21455,13 @@ virDomainGraphicsListenDefFormat(virBufferPtr buf,
virBufferEscapeString(buf, " network='%s'", def->network);
}
+ if (def->socket &&
+ def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET &&
+ !(def->autogenerated &&
+ (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))) {
+ virBufferEscapeString(buf, " socket='%s'", def->socket);
+ }
+
if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS)
virBufferAsprintf(buf, " fromConfig='%d'",
def->fromConfig);
@@ -21447,11 +21519,17 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
switch (def->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
- if (def->data.vnc.socket) {
- if (!def->data.vnc.socketAutogenerated ||
- !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) {
- virBufferEscapeString(buf, " socket='%s'",
- def->data.vnc.socket);
+ if (!glisten) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("missing listen element for graphics"));
+ return -1;
+ }
+
+ if (glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) {
+ if (glisten->socket &&
+ !((glisten->autogenerated || glisten->fromConfig) &&
+ (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))) {
+ virBufferEscapeString(buf, " socket='%s'",
glisten->socket);
}
} else {
if (def->data.vnc.port &&
@@ -21557,9 +21635,19 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
for (i = 0; i < def->nListens; i++) {
if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE)
continue;
- if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
- def->listens[i].fromConfig)
- continue;
+ if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) {
+ if (def->listens[i].fromConfig)
+ continue;
+
+ /* If the socket is provided by user in the XML we need to skip this
+ * listen type to support migration back to old libvirt since old
+ * libvirt supports specifying socket path inside graphics element
+ * as 'socket' attribute. */
+ if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
+ def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET
&&
+ !def->listens[i].autogenerated)
+ continue;
+ }
if (!children) {
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
@@ -23873,6 +23961,30 @@ virDomainGraphicsListenAppendAddress(virDomainGraphicsDefPtr
def,
}
+int
+virDomainGraphicsListenAppendSocket(virDomainGraphicsDefPtr def,
+ const char *socket)
+{
+ virDomainGraphicsListenDef listen;
+
+ memset(&listen, 0, sizeof(listen));
+
+ listen.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET;
+
+ if (VIR_STRDUP(listen.socket, socket) < 0)
+ goto error;
+
+ if (VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, listen) < 0)
+ goto error;
+
+ return 0;
+
+ error:
+ VIR_FREE(listen.socket);
+ return -1;
+}
+
+
/**
* virDomainNetFind:
* @def: domain's def
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4e21826..53696a0 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1539,6 +1539,7 @@ typedef enum {
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE = 0,
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS,
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK,
+ VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET,
VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST
} virDomainGraphicsListenType;
@@ -1555,7 +1556,9 @@ struct _virDomainGraphicsListenDef {
virDomainGraphicsListenType type;
char *address;
char *network;
+ char *socket;
bool fromConfig; /* true if the @address is config file originated */
+ bool autogenerated;
};
struct _virDomainGraphicsDef {
@@ -1572,8 +1575,6 @@ struct _virDomainGraphicsDef {
int websocket;
bool autoport;
char *keymap;
- char *socket;
- bool socketAutogenerated;
virDomainGraphicsAuthDef auth;
int sharePolicy;
} vnc;
@@ -2849,6 +2850,9 @@ virDomainGraphicsGetListen(virDomainGraphicsDefPtr def, size_t i);
int virDomainGraphicsListenAppendAddress(virDomainGraphicsDefPtr def,
const char *address)
ATTRIBUTE_NONNULL(1);
+int virDomainGraphicsListenAppendSocket(virDomainGraphicsDefPtr def,
+ const char *socket)
+ ATTRIBUTE_NONNULL(1);
int virDomainNetGetActualType(virDomainNetDefPtr iface);
const char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 868bcfa..1b25c9b 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -305,6 +305,7 @@ virDomainGraphicsAuthConnectedTypeToString;
virDomainGraphicsDefFree;
virDomainGraphicsGetListen;
virDomainGraphicsListenAppendAddress;
+virDomainGraphicsListenAppendSocket;
virDomainGraphicsSpiceChannelModeTypeFromString;
virDomainGraphicsSpiceChannelModeTypeToString;
virDomainGraphicsSpiceChannelNameTypeFromString;
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 4fa5e8a..59c839e 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -15,9 +15,9 @@
# unix socket. This prevents unprivileged access from users on the
# host machine, though most VNC clients do not support it.
#
-# This will only be enabled for VNC configurations that do not have
-# a hardcoded 'listen' or 'socket' value. This setting takes preference
-# over vnc_listen.
+# This will only be enabled for VNC configurations that have listen
+# type=address but without any address specified. This setting takes
+# preference over vnc_listen.
#
#vnc_auto_unix_socket = 1
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e401ac5..d41935e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7379,8 +7379,7 @@ static int
qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
virCommandPtr cmd,
virQEMUCapsPtr qemuCaps,
- virDomainGraphicsDefPtr graphics,
- const char *domainLibDir)
+ virDomainGraphicsDefPtr graphics)
{
virBuffer opt = VIR_BUFFER_INITIALIZER;
virDomainGraphicsListenDefPtr glisten = NULL;
@@ -7392,21 +7391,20 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
goto error;
}
- glisten = virDomainGraphicsGetListen(graphics, 0);
-
- if (graphics->data.vnc.socket || cfg->vncAutoUnixSocket) {
- if (!graphics->data.vnc.socket) {
- if (virAsprintf(&graphics->data.vnc.socket,
- "%s/vnc.sock", domainLibDir) < 0)
- goto error;
-
- graphics->data.vnc.socketAutogenerated = true;
- }
+ if (!(glisten = virDomainGraphicsGetListen(graphics, 0))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("missing listen element"));
+ goto error;
+ }
+ switch (glisten->type) {
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
virBufferAddLit(&opt, "unix:");
- qemuBufferEscapeComma(&opt, graphics->data.vnc.socket);
+ qemuBufferEscapeComma(&opt, glisten->socket);
+ break;
- } else {
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
if (!graphics->data.vnc.autoport &&
(graphics->data.vnc.port < 5900 ||
graphics->data.vnc.port > 65535)) {
@@ -7415,7 +7413,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
goto error;
}
- if (glisten && glisten->address) {
+ if (glisten->address) {
escapeAddr = strchr(glisten->address, ':') != NULL;
if (escapeAddr)
virBufferAsprintf(&opt, "[%s]", glisten->address);
@@ -7424,17 +7422,21 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
}
virBufferAsprintf(&opt, ":%d",
graphics->data.vnc.port - 5900);
- }
- if (!graphics->data.vnc.socket &&
- graphics->data.vnc.websocket) {
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("VNC WebSockets are not supported "
- "with this QEMU binary"));
- goto error;
+ if (graphics->data.vnc.websocket) {
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("VNC WebSockets are not supported "
+ "with this QEMU binary"));
+ goto error;
+ }
+ virBufferAsprintf(&opt, ",websocket=%d",
graphics->data.vnc.websocket);
}
- virBufferAsprintf(&opt, ",websocket=%d",
graphics->data.vnc.websocket);
+ break;
+
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
+ break;
}
if (graphics->data.vnc.sharePolicy) {
@@ -7701,8 +7703,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
virCommandPtr cmd,
virDomainDefPtr def,
virQEMUCapsPtr qemuCaps,
- virDomainGraphicsDefPtr graphics,
- const char *domainLibDir)
+ virDomainGraphicsDefPtr graphics)
{
switch (graphics->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
@@ -7734,8 +7735,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
break;
case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
- return qemuBuildGraphicsVNCCommandLine(cfg, cmd, qemuCaps,
- graphics, domainLibDir);
+ return qemuBuildGraphicsVNCCommandLine(cfg, cmd, qemuCaps, graphics);
case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
return qemuBuildGraphicsSPICECommandLine(cfg, cmd, qemuCaps, graphics);
@@ -9463,7 +9463,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
for (i = 0; i < def->ngraphics; ++i) {
if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps,
- def->graphics[i], domainLibDir) < 0)
+ def->graphics[i]) < 0)
goto error;
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 65dfa37..31b28a7 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2001,20 +2001,30 @@ qemuDomainRecheckInternalPaths(virDomainDefPtr def,
unsigned int flags)
{
size_t i = 0;
+ size_t j = 0;
for (i = 0; i < def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = def->graphics[i];
- if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
- graphics->data.vnc.socket &&
- STRPREFIX(graphics->data.vnc.socket, cfg->libDir)) {
- if (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) {
- VIR_FREE(graphics->data.vnc.socket);
- if (virDomainGraphicsListenAppendAddress(graphics, NULL) < 0)
- return -1;
+ for (j = 0; j < graphics->nListens; ++j) {
+ virDomainGraphicsListenDefPtr glisten = &graphics->listens[j];
+
+ /* This will happen only if we parse XML from old libvirts where
+ * unix socket was available only for VNC graphics. In this
+ * particular case we should follow the behavior and if we remove
+ * the auto-generated socket we need to change the listen type to
+ * address. */
+ if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
+ glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET &&
+ glisten->socket &&
+ STRPREFIX(glisten->socket, cfg->libDir)) {
+ if (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) {
+ VIR_FREE(glisten->socket);
+ glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS;
+ } else {
+ glisten->autogenerated = true;
+ }
}
- else
- graphics->data.vnc.socketAutogenerated = true;
}
}
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index aa897d2..acf49d0 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2662,6 +2662,15 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
break;
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
+ if (STRNEQ_NULLABLE(newlisten->socket, oldlisten->socket)) {
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+ _("cannot change listen socket setting "
+ "on '%s' graphics"), type);
+ goto cleanup;
+ }
+ break;
+
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
/* nada */
diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index e30586f..a813705 100644
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -509,7 +509,7 @@ qemuParseCommandLineVnc(virDomainDefPtr def,
if (STRPREFIX(val, "unix:")) {
/* -vnc unix:/some/big/path */
- if (VIR_STRDUP(vnc->data.vnc.socket, val + 5) < 0)
+ if (virDomainGraphicsListenAppendSocket(vnc, val + 5) < 0)
goto cleanup;
} else {
/*
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 2019c73..096c025 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3863,9 +3863,6 @@ qemuProcessVNCAllocatePorts(virQEMUDriverPtr driver,
{
unsigned short port;
- if (graphics->data.vnc.socket)
- return 0;
-
if (!allocate) {
if (graphics->data.vnc.autoport)
graphics->data.vnc.port = 5900;
@@ -4415,13 +4412,18 @@
qemuProcessGraphicsSetupNetworkAddress(virDomainGraphicsListenDefPtr glisten,
static int
qemuProcessGraphicsSetupListen(virQEMUDriverConfigPtr cfg,
- virDomainGraphicsDefPtr graphics)
+ virDomainGraphicsDefPtr graphics,
+ virDomainObjPtr vm)
{
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ const char *type = virDomainGraphicsTypeToString(graphics->type);
char *listenAddr = NULL;
+ bool useSocket = false;
size_t i;
switch (graphics->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
+ useSocket = cfg->vncAutoUnixSocket;
listenAddr = cfg->vncListen;
break;
@@ -4441,13 +4443,23 @@ qemuProcessGraphicsSetupListen(virQEMUDriverConfigPtr cfg,
switch (glisten->type) {
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
- if (glisten->address || !listenAddr)
- continue;
-
- if (VIR_STRDUP(glisten->address, listenAddr) < 0)
- return -1;
-
- glisten->fromConfig = true;
+ if (!glisten->address) {
+ /* If there is no address specified and qemu.conf has
+ * *_auto_unix_socket set we should use unix socket as
+ * default instead of tcp listen. */
+ if (useSocket) {
+ memset(glisten, 0, sizeof(virDomainGraphicsListenDef));
+ if (virAsprintf(&glisten->socket, "%s/%s.sock",
+ priv->libDir, type) < 0)
+ return -1;
+ glisten->fromConfig = true;
+ glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET;
+ } else if (listenAddr) {
+ if (VIR_STRDUP(glisten->address, listenAddr) < 0)
+ return -1;
+ glisten->fromConfig = true;
+ }
+ }
break;
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
@@ -4459,6 +4471,15 @@ qemuProcessGraphicsSetupListen(virQEMUDriverConfigPtr cfg,
return -1;
break;
+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
+ if (!glisten->socket) {
+ if (virAsprintf(&glisten->socket, "%s/%s.sock",
+ priv->libDir, type) < 0)
+ return -1;
+ glisten->autogenerated = true;
+ }
+ break;
+
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
break;
@@ -4503,7 +4524,7 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver,
break;
}
- if (qemuProcessGraphicsSetupListen(cfg, graphics) < 0)
+ if (qemuProcessGraphicsSetupListen(cfg, graphics, vm) < 0)
goto cleanup;
}
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 537e89d..cbe09af 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1002,10 +1002,17 @@ get_files(vahControl * ctl)
goto cleanup;
for (i = 0; i < ctl->def->ngraphics; i++) {
- if (ctl->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC
&&
- ctl->def->graphics[i]->data.vnc.socket &&
- vah_add_file(&buf, ctl->def->graphics[i]->data.vnc.socket,
"w"))
- goto cleanup;
+ virDomainGraphicsDefPtr graphics = ctl->def->graphics[i];
+ size_t n;
+
+ for (n = 0; n < graphics->nListens; n++) {
+ virDomainGraphicsListenDef listenObj = graphics->listens[n];
+
+ if (listenObj.type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET &&
+ listenObj.socket &&
+ vah_add_file(&buf, listenObj.socket, "rw"))
+ goto cleanup;
+ }
}
if (ctl->def->ngraphics == 1 &&
diff --git
a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
new file mode 100644
index 0000000..a32c20b
--- /dev/null
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' socket='/tmp/vnc.sock'>
+ <listen type='address' address='0.0.0.0'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git
a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
new file mode 100644
index 0000000..980b64c
--- /dev/null
+++
b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' socket='/tmp/vnc.sock'>
+ <listen type='socket' socket='/tmp/mismatch.sock'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
new file mode 100644
index 0000000..ea3efca
--- /dev/null
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' socket='/tmp/vnc.sock'>
+ <listen type='socket' socket='/tmp/vnc.sock'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git
a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
new file mode 100644
index 0000000..f205e13
--- /dev/null
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' socket='/tmp/vnc.sock'>
+ <listen type='socket' socket='/tmp/vnc.sock'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'
primary='yes'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git
a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
new file mode 100644
index 0000000..f205e13
--- /dev/null
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' socket='/tmp/vnc.sock'>
+ <listen type='socket' socket='/tmp/vnc.sock'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'
primary='yes'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
index d8742c6..cb4e5ac 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
@@ -19,7 +19,9 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' socket='/tmp/QEMUGuest1-vnc.sock'/>
+ <graphics type='vnc' socket='/tmp/QEMUGuest1-vnc.sock'>
+ <listen type='socket' socket='/tmp/QEMUGuest1-vnc.sock'/>
+ </graphics>
<video>
<model type='cirrus' vram='16384' heads='1'
primary='yes'/>
</video>
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
index d8742c6..cb4e5ac 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
@@ -19,7 +19,9 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' socket='/tmp/QEMUGuest1-vnc.sock'/>
+ <graphics type='vnc' socket='/tmp/QEMUGuest1-vnc.sock'>
+ <listen type='socket' socket='/tmp/QEMUGuest1-vnc.sock'/>
+ </graphics>
<video>
<model type='cirrus' vram='16384' heads='1'
primary='yes'/>
</video>
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index 70ecd2d..a193a33 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -87,6 +87,10 @@ mymain(void)
DO_TEST_DIFFERENT("graphics-vnc-listen-attr-only");
DO_TEST_DIFFERENT("graphics-vnc-listen-element-minimal");
DO_TEST_DIFFERENT("graphics-vnc-listen-element-with-address");
+ DO_TEST_DIFFERENT("graphics-vnc-socket-attr-listen-address");
+ DO_TEST_DIFFERENT("graphics-vnc-socket-attr-listen-socket");
+ DO_TEST_FULL("graphics-vnc-socket-attr-listen-socket-mismatch", 0, false,
+ TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("name-slash-parse", 0, false,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
index edbaab3..efd2601 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
@@ -29,7 +29,9 @@
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' socket='/tmp/foo.socket'/>
+ <graphics type='vnc' socket='/tmp/foo.socket'>
+ <listen type='socket' socket='/tmp/foo.socket'/>
+ </graphics>
<video>
<model type='cirrus' vram='16384' heads='1'
primary='yes'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args
new file mode 100644
index 0000000..84ce727
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args
@@ -0,0 +1,20 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/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 \
+-vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
+-vga cirrus
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml
new file mode 100644
index 0000000..3e455df
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc'>
+ <listen type='socket'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
index 2464867..abf724c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
@@ -16,7 +16,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot c \
-usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--vnc unix:/tmp/foo.socket \
+-vnc unix:/tmp/vnc.sock \
-vga cirrus
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
index de70bc4..522c3af 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
@@ -14,18 +14,14 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' socket='/tmp/foo.socket'/>
+ <graphics type='vnc'>
+ <listen type='socket' socket='/tmp/vnc.sock'/>
+ </graphics>
<video>
<model type='cirrus' vram='16384' heads='1'/>
</video>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index de96e19..da060d2 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -903,6 +903,8 @@ mymain(void)
driver.config->vncAutoUnixSocket = true;
DO_TEST("graphics-vnc-auto-socket-cfg", QEMU_CAPS_VNC);
driver.config->vncAutoUnixSocket = false;
+ DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC);
+ DO_TEST("graphics-vnc-auto-socket", QEMU_CAPS_VNC);
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml
new file mode 100644
index 0000000..e14bbd1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml
@@ -0,0 +1,35 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc'>
+ <listen type='socket'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'
primary='yes'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git
a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml
index f3ccfdf..1aeffe8 100644
---
a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml
+++
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml
@@ -29,7 +29,9 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc'
socket='/tmp/lib/domain-99-QEMUGuest1/delete.this.socket'/>
+ <graphics type='vnc'
socket='/tmp/lib/domain-99-QEMUGuest1/delete.this.socket'>
+ <listen type='socket'
socket='/tmp/lib/domain-99-QEMUGuest1/delete.this.socket'/>
+ </graphics>
<video>
<model type='cirrus' vram='16384' heads='1'
primary='yes'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml
new file mode 100644
index 0000000..9a83328
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml
@@ -0,0 +1,35 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <controller type='usb' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' socket='/tmp/vnc.sock'>
+ <listen type='socket' socket='/tmp/vnc.sock'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='16384' heads='1'
primary='yes'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ </video>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 962e9ba..92372ee 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -437,6 +437,8 @@ mymain(void)
cfg->vncAutoUnixSocket = true;
DO_TEST("graphics-vnc-auto-socket-cfg");
cfg->vncAutoUnixSocket = false;
+ DO_TEST("graphics-vnc-socket");
+ DO_TEST("graphics-vnc-auto-socket");
DO_TEST("graphics-sdl");
DO_TEST("graphics-sdl-fullscreen");
--
2.8.2