From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 6 Mar 2025 10:51:04 +0000 (+0100)
Subject: domain_conf: graphics: extract RDP formatting to separate function
X-Git-Tag: v11.2.0-rc1~246
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2dcb47413ea158ef1820fc7c69c5929a990ac5b;p=thirdparty%2Flibvirt.git

domain_conf: graphics: extract RDP formatting to separate function

virDomainGraphicsDefFormat function was way too long so split it into
separate functions for each graphics type.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

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: