virDomainGraphicsDefFormat function was way too long so split it into separate functions for each graphics type. Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- src/conf/domain_conf.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4314ef4dc4..9400206e8f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26470,6 +26470,30 @@ virDomainGraphicsDefFormatSDL(virBuffer *attrBuf, virDomainGraphicsDefFormatGL(childBuf, def->data.sdl.gl, NULL); } +static void +virDomainGraphicsDefFormatRDP(virBuffer *attrBuf, + virDomainGraphicsDef *def, + unsigned int flags) +{ + virDomainGraphicsListenDef *glisten = virDomainGraphicsGetListen(def, 0); + + if (def->data.rdp.port) + virBufferAsprintf(attrBuf, " port='%d'", def->data.rdp.port); + else if (def->data.rdp.autoport) + virBufferAddLit(attrBuf, " port='0'"); + + if (def->data.rdp.autoport) + virBufferAddLit(attrBuf, " autoport='yes'"); + + if (def->data.rdp.replaceUser) + virBufferAddLit(attrBuf, " replaceUser='yes'"); + + if (def->data.rdp.multiUser) + virBufferAddLit(attrBuf, " multiUser='yes'"); + + virDomainGraphicsListenDefFormatAddr(attrBuf, glisten, flags); +} + static int virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDef *def, @@ -26500,23 +26524,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: - if (def->data.rdp.port) - virBufferAsprintf(&attrBuf, " port='%d'", - def->data.rdp.port); - else if (def->data.rdp.autoport) - virBufferAddLit(&attrBuf, " port='0'"); - - if (def->data.rdp.autoport) - virBufferAddLit(&attrBuf, " autoport='yes'"); - - if (def->data.rdp.replaceUser) - virBufferAddLit(&attrBuf, " replaceUser='yes'"); - - if (def->data.rdp.multiUser) - virBufferAddLit(&attrBuf, " multiUser='yes'"); - - virDomainGraphicsListenDefFormatAddr(&attrBuf, glisten, flags); - + virDomainGraphicsDefFormatRDP(&attrBuf, def, flags); break; case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: -- 2.48.1