Only VNC, RDP and Spice graphics types are using listen elements so call
the function only where it is needed.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
src/conf/domain_conf.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d39b885101..ad3a44b9b1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26425,6 +26425,7 @@ virDomainGraphicsDefFormatAudio(virBuffer *buf,
static int
virDomainGraphicsDefFormatVNC(virBuffer *attrBuf,
+ virBuffer *childBuf,
virDomainGraphicsDef *def,
unsigned int flags)
{
@@ -26490,6 +26491,8 @@ virDomainGraphicsDefFormatVNC(virBuffer *attrBuf,
virDomainGraphicsAuthDefFormatAttr(attrBuf, &def->data.vnc.auth, flags);
+ virDomainGraphicsDefFormatListnes(childBuf, def, flags);
+
return 0;
}
@@ -26510,6 +26513,7 @@ virDomainGraphicsDefFormatSDL(virBuffer *attrBuf,
static void
virDomainGraphicsDefFormatRDP(virBuffer *attrBuf,
+ virBuffer *childBuf,
virDomainGraphicsDef *def,
unsigned int flags)
{
@@ -26530,6 +26534,8 @@ virDomainGraphicsDefFormatRDP(virBuffer *attrBuf,
virBufferAddLit(attrBuf, " multiUser='yes'");
virDomainGraphicsListenDefFormatAddr(attrBuf, glisten, flags);
+
+ virDomainGraphicsDefFormatListnes(childBuf, def, flags);
}
static void
@@ -26544,6 +26550,7 @@ virDomainGraphicsDefFormatDesktop(virBuffer *attrBuf,
static int
virDomainGraphicsDefFormatSpice(virBuffer *attrBuf,
+ virBuffer *childBuf,
virDomainGraphicsDef *def,
unsigned int flags)
{
@@ -26600,6 +26607,8 @@ virDomainGraphicsDefFormatSpice(virBuffer *attrBuf,
virDomainGraphicsAuthDefFormatAttr(attrBuf, &def->data.spice.auth, flags);
+ virDomainGraphicsDefFormatListnes(childBuf, def, flags);
+
return 0;
}
@@ -26648,7 +26657,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
switch (def->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
- if (virDomainGraphicsDefFormatVNC(&attrBuf, def, flags) < 0)
+ if (virDomainGraphicsDefFormatVNC(&attrBuf, &childBuf, def, flags) < 0)
return -1;
break;
@@ -26657,7 +26666,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
break;
case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
- virDomainGraphicsDefFormatRDP(&attrBuf, def, flags);
+ virDomainGraphicsDefFormatRDP(&attrBuf, &childBuf, def, flags);
break;
case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
@@ -26665,7 +26674,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
break;
case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
- if (virDomainGraphicsDefFormatSpice(&attrBuf, def, flags) < 0)
+ if (virDomainGraphicsDefFormatSpice(&attrBuf, &childBuf, def, flags) < 0)
return -1;
break;
@@ -26681,8 +26690,6 @@ virDomainGraphicsDefFormat(virBuffer *buf,
break;
}
- virDomainGraphicsDefFormatListnes(&childBuf, def, flags);
-
if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
g_auto(virBuffer) spiceBuf = VIR_BUFFER_INITIALIZER;
--
2.48.1