From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 6 Mar 2025 11:11:33 +0000 (+0100)
Subject: domain_conf: graphics: extract DBus formatting to separate function
X-Git-Tag: v11.2.0-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c2c7720fe1fd3633dec3c342c10ba0f8a485812;p=thirdparty%2Flibvirt.git

domain_conf: graphics: extract DBus 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 85db84c496..4b9297a780 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26610,6 +26610,23 @@ virDomainGraphicsDefFormatEGLHeadless(virBuffer *childBuf,
                                  def->data.egl_headless.rendernode);
 }
 
+static void
+virDomainGraphicsDefFormatDBus(virBuffer *attrBuf,
+                               virBuffer *childBuf,
+                               virDomainGraphicsDef *def)
+{
+    if (def->data.dbus.p2p)
+        virBufferAddLit(attrBuf, " p2p='yes'");
+
+    if (def->data.dbus.address)
+        virBufferAsprintf(attrBuf, " address='%s'", def->data.dbus.address);
+
+    virDomainGraphicsDefFormatGL(childBuf, def->data.dbus.gl,
+                                 def->data.dbus.rendernode);
+
+    virDomainGraphicsDefFormatAudio(childBuf, def->data.dbus.audioId);
+}
+
 static int
 virDomainGraphicsDefFormat(virBuffer *buf,
                            virDomainGraphicsDef *def,
@@ -26656,18 +26673,9 @@ virDomainGraphicsDefFormat(virBuffer *buf,
         break;
 
     case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
-        if (def->data.dbus.p2p)
-            virBufferAddLit(&attrBuf, " p2p='yes'");
-        if (def->data.dbus.address)
-            virBufferAsprintf(&attrBuf, " address='%s'",
-                              def->data.dbus.address);
-
-        virDomainGraphicsDefFormatGL(&childBuf, def->data.dbus.gl,
-                                     def->data.dbus.rendernode);
-
-        virDomainGraphicsDefFormatAudio(&childBuf, def->data.dbus.audioId);
-
+        virDomainGraphicsDefFormatDBus(&attrBuf, &childBuf, def);
         break;
+
     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
         break;
     }