From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 6 Mar 2025 11:50:06 +0000 (+0100)
Subject: domain_conf: graphics: move remaining VNC formatting
X-Git-Tag: v11.2.0-rc1~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ef5926a803c70bc510bf1b421d2bb9f054744cf;p=thirdparty%2Flibvirt.git

domain_conf: graphics: move remaining VNC formatting

Now we are able to move the rest into virDomainGraphicsDefFormatVNC
without breaking order of elements in the resulting XML.

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 d4b257b4a8..fbbc7705e8 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26530,6 +26530,8 @@ virDomainGraphicsDefFormatVNC(virBuffer *attrBuf,
 
     virDomainGraphicsDefFormatListnes(childBuf, def, flags);
 
+    virDomainGraphicsDefFormatAudio(childBuf, def->data.vnc.audioId);
+
     return 0;
 }
 
@@ -26765,9 +26767,6 @@ virDomainGraphicsDefFormat(virBuffer *buf,
         break;
     }
 
-    if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC)
-        virDomainGraphicsDefFormatAudio(&childBuf, def->data.vnc.audioId);
-
     virXMLFormatElement(buf, "graphics", &attrBuf, &childBuf);
 
     return 0;