External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 13:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: introduce virDomainGraphicsListenDefFormatAddr

Browse Source 
Move code that decide whether we print the 'listen' attribute or not
into virDomainGraphicsListenDefFormatAddr() function.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-05-17 15:22:26 +02:00
parent 6bd0cd3b73
commit 54820cc600
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/conf/domain_conf.c
View File

@ -21417,13 +21417,43 @@ virDomainGraphicsListenDefFormat(virBufferPtr buf,
} }
/**
* virDomainGraphicsListenDefFormatAddr:
* @buf: buffer where the output XML is written
* @glisten: first listen element
* @flags: bit-wise or of VIR_DOMAIN_DEF_FORMAT_*
*
* This is used to add a legacy 'listen' attribute into <graphics> element to
* improve backward compatibility.
*/
static void
virDomainGraphicsListenDefFormatAddr(virBufferPtr buf,
virDomainGraphicsListenDefPtr glisten,
unsigned int flags)
{
if (!glisten)
return;
if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && glisten->fromConfig)
return;
if (glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK &&
flags & (VIR_DOMAIN_DEF_FORMAT_INACTIVE |
VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))
return;
if (glisten->address)
virBufferAsprintf(buf, " listen='%s'", glisten->address);
}
static int static int
virDomainGraphicsDefFormat(virBufferPtr buf, virDomainGraphicsDefFormat(virBufferPtr buf,
virDomainGraphicsDefPtr def, virDomainGraphicsDefPtr def,
unsigned int flags) unsigned int flags)
{ {
virDomainGraphicsListenDefPtr glisten = virDomainGraphicsGetListen(def, 0);
const char *type = virDomainGraphicsTypeToString(def->type); const char *type = virDomainGraphicsTypeToString(def->type);
const char *listenAddr = NULL;
bool children = false; bool children = false;
size_t i; size_t i;
@ -21433,24 +21463,6 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
return -1; return -1;
} }
/* find the first listen subelement with a valid address and
* duplicate its address attribute as the listen attribute of
* <graphics>. This is done to improve backward compatibility.
*/
for (i = 0; i < def->nListens; i++) {
if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
def->listens[i].fromConfig)
continue;
if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK &&
flags & (VIR_DOMAIN_DEF_FORMAT_INACTIVE |
VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))
continue;
if ((listenAddr = def->listens[i].address))
break;
}
virBufferAsprintf(buf, "<graphics type='%s'", type); virBufferAsprintf(buf, "<graphics type='%s'", type);
switch (def->type) { switch (def->type) {
@ -21475,8 +21487,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
if (def->data.vnc.websocket) if (def->data.vnc.websocket)
virBufferAsprintf(buf, " websocket='%d'", def->data.vnc.websocket); virBufferAsprintf(buf, " websocket='%d'", def->data.vnc.websocket);
if (listenAddr) virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
virBufferAsprintf(buf, " listen='%s'", listenAddr);
} }
if (def->data.vnc.keymap) if (def->data.vnc.keymap)
@ -21520,8 +21531,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
if (def->data.rdp.multiUser) if (def->data.rdp.multiUser)
virBufferAddLit(buf, " multiUser='yes'"); virBufferAddLit(buf, " multiUser='yes'");
if (listenAddr) virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
virBufferAsprintf(buf, " listen='%s'", listenAddr);
break; break;
@ -21547,8 +21557,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
virBufferAsprintf(buf, " autoport='%s'", virBufferAsprintf(buf, " autoport='%s'",
def->data.spice.autoport ? "yes" : "no"); def->data.spice.autoport ? "yes" : "no");
if (listenAddr) virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
virBufferAsprintf(buf, " listen='%s'", listenAddr);
if (def->data.spice.keymap) if (def->data.spice.keymap)
virBufferEscapeString(buf, " keymap='%s'", virBufferEscapeString(buf, " keymap='%s'",