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

domain_conf: graphics: extract SDL 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 6884a317d7..697d5f18ba 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26492,6 +26492,21 @@ virDomainGraphicsDefFormatVNC(virBuffer *attrBuf,
     return 0;
 }
 
+static void
+virDomainGraphicsDefFormatSDL(virBuffer *attrBuf,
+                              virBuffer *childBuf,
+                              virDomainGraphicsDef *def)
+{
+    virBufferEscapeString(attrBuf, " display='%s'", def->data.sdl.display);
+
+    virBufferEscapeString(attrBuf, " xauth='%s'", def->data.sdl.xauth);
+
+    if (def->data.sdl.fullscreen)
+        virBufferAddLit(attrBuf, " fullscreen='yes'");
+
+    virDomainGraphicsDefFormatGL(childBuf, def->data.sdl.gl, NULL);
+}
+
 static int
 virDomainGraphicsDefFormat(virBuffer *buf,
                            virDomainGraphicsDef *def,
@@ -26518,15 +26533,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
         break;
 
     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-        virBufferEscapeString(&attrBuf, " display='%s'",
-                              def->data.sdl.display);
-
-        virBufferEscapeString(&attrBuf, " xauth='%s'",
-                              def->data.sdl.xauth);
-        if (def->data.sdl.fullscreen)
-            virBufferAddLit(&attrBuf, " fullscreen='yes'");
-
-        virDomainGraphicsDefFormatGL(&childBuf, def->data.sdl.gl, NULL);
+        virDomainGraphicsDefFormatSDL(&attrBuf, &childBuf, def);
         break;
 
     case VIR_DOMAIN_GRAPHICS_TYPE_RDP: