From c2dcb47413ea158ef1820fc7c69c5929a990ac5b Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 6 Mar 2025 11:51:04 +0100 Subject: [PATCH] domain_conf: graphics: extract RDP formatting to separate function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit virDomainGraphicsDefFormat function was way too long so split it into separate functions for each graphics type. Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko --- 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 697d5f18ba..3587abc24a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26507,6 +26507,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, @@ -26537,23 +26561,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.47.3