From nobody Wed Mar 12 17:49:07 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
 8.43.85.245 as permitted sender) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
 permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1741263839923938.5922965427765;
 Thu, 6 Mar 2025 04:23:59 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 514FF15D0; Thu,  6 Mar 2025 07:23:59 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 9D2E41624;
	Thu,  6 Mar 2025 07:22:44 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 1D30015A1; Thu,  6 Mar 2025 07:22:40 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 25B381596
	for <devel@lists.libvirt.org>; Thu,  6 Mar 2025 07:22:39 -0500 (EST)
Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com
 (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by
 relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-299-YglKgqSdPjqY0Jm-SijO9w-1; Thu,
 06 Mar 2025 07:22:37 -0500
Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com
 (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
 id C0B321800262
	for <devel@lists.libvirt.org>; Thu,  6 Mar 2025 12:22:36 +0000 (UTC)
Received: from antique-work.redhat.com (unknown [10.44.33.191])
	by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
 id A408D30001A1
	for <devel@lists.libvirt.org>; Thu,  6 Mar 2025 12:22:35 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,
	RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1741263758;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=xooWaNlIGdBPk30AOVdC8t1sZSV1Rh3W7lXf6zTFous=;
	b=aaqATY1h1nj7e1JpsRwXKAivRIyJRGHIShici3bcPii1YnnOIAzj70xSh9o3O94XQNloyK
	/ySiVtOmhGxtSpO6hVpDFX2UE/MbA+qFb5viD+Dkzb5nNSsrlD2RZtXjzBFETSCD+NcLoO
	ywPp+cAq20mDnSYDEVv/WHfLUVJ0m+k=
X-MC-Unique: YglKgqSdPjqY0Jm-SijO9w-1
X-Mimecast-MFC-AGG-ID: YglKgqSdPjqY0Jm-SijO9w_1741263756
From: Pavel Hrdina <phrdina@redhat.com>
To: devel@lists.libvirt.org
Subject: [libvirt PATCH 03/16] domain_conf: modernize graphics formatting
Date: Thu,  6 Mar 2025 13:22:11 +0100
Message-ID: 
 <ccd240f098c18b8a5eac9b9a6db985e7863a8bd6.1741263715.git.phrdina@redhat.com>
In-Reply-To: <cover.1741263714.git.phrdina@redhat.com>
References: <cover.1741263714.git.phrdina@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: rGtm7Q21rCtsrTK6hVGTt4cxvzn-QDTeYKgPtgRZ8II_1741263756
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: S23G7D3BHSQCB4KXBDBBGOSJWBM4KRLZ
X-Message-ID-Hash: S23G7D3BHSQCB4KXBDBBGOSJWBM4KRLZ
X-MailFrom: phrdina@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/S23G7D3BHSQCB4KXBDBBGOSJWBM4KRLZ/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1741263842233019000
Content-Type: text/plain; charset="utf-8"; x-default="true"

Use separate buffers for attributes and children elements to make the
code cleaner and to use the virXMLFormatElement() function.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/conf/domain_conf.c | 235 ++++++++++++++++-------------------------
 1 file changed, 92 insertions(+), 143 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a0e68d6046..8de39e7767 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26287,13 +26287,14 @@ virDomainGraphicsListenDefFormat(virBuffer *buf,
                                  virDomainGraphicsListenDef *def,
                                  unsigned int flags)
 {
+    g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
+
     /* If generating migratable XML, skip listen address
      * dragged in from config file */
     if ((flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) && def->fromConfig)
         return;
=20
-    virBufferAddLit(buf, "<listen");
-    virBufferAsprintf(buf, " type=3D'%s'",
+    virBufferAsprintf(&attrBuf, " type=3D'%s'",
                       virDomainGraphicsListenTypeToString(def->type));
=20
     if (def->address &&
@@ -26302,28 +26303,28 @@ virDomainGraphicsListenDefFormat(virBuffer *buf,
           !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)))) {
         /* address may also be set to show current status when type=3D'net=
work',
          * but we don't want to print that if INACTIVE data is requested. =
*/
-        virBufferAsprintf(buf, " address=3D'%s'", def->address);
+        virBufferAsprintf(&attrBuf, " address=3D'%s'", def->address);
     }
=20
     if (def->network &&
         (def->type =3D=3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) {
-        virBufferEscapeString(buf, " network=3D'%s'", def->network);
+        virBufferEscapeString(&attrBuf, " network=3D'%s'", def->network);
     }
=20
     if (def->socket &&
         def->type =3D=3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET &&
         !(def->autoGenerated &&
           (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))) {
-        virBufferEscapeString(buf, " socket=3D'%s'", def->socket);
+        virBufferEscapeString(&attrBuf, " socket=3D'%s'", def->socket);
     }
=20
     if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS) {
-        virBufferAsprintf(buf, " fromConfig=3D'%d'", def->fromConfig);
-        virBufferAsprintf(buf, " autoGenerated=3D'%s'",
+        virBufferAsprintf(&attrBuf, " fromConfig=3D'%d'", def->fromConfig);
+        virBufferAsprintf(&attrBuf, " autoGenerated=3D'%s'",
                           def->autoGenerated ? "yes" : "no");
     }
=20
-    virBufferAddLit(buf, "/>\n");
+    virXMLFormatElement(buf, "listen", &attrBuf, NULL);
 }
=20
=20
@@ -26361,28 +26362,27 @@ virDomainGraphicsDefFormatGL(virBuffer *buf,
                              virTristateBool gl,
                              char *rendernode)
 {
-    if (gl =3D=3D VIR_TRISTATE_BOOL_ABSENT && !rendernode)
-        return;
-
-    virBufferAddLit(buf, "<gl");
+    g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
=20
     if (gl !=3D VIR_TRISTATE_BOOL_ABSENT)
-        virBufferAsprintf(buf, " enable=3D'%s'", virTristateBoolTypeToStri=
ng(gl));
+        virBufferAsprintf(&attrBuf, " enable=3D'%s'", virTristateBoolTypeT=
oString(gl));
=20
     if (rendernode)
-        virBufferEscapeString(buf, " rendernode=3D'%s'", rendernode);
+        virBufferEscapeString(&attrBuf, " rendernode=3D'%s'", rendernode);
=20
-    virBufferAddLit(buf, "/>\n");
+    virXMLFormatElement(buf, "gl", &attrBuf, NULL);
 }
=20
 static void
 virDomainGraphicsDefFormatAudio(virBuffer *buf,
                                 unsigned int audioId)
 {
-    if (audioId <=3D 0)
-        return;
+    g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
=20
-    virBufferAsprintf(buf, "<audio id=3D'%d'/>\n", audioId);
+    if (audioId > 0)
+        virBufferAsprintf(&attrBuf, " id=3D'%d'", audioId);
+
+    virXMLFormatElement(buf, "audio", &attrBuf, NULL);
 }
=20
 static int
@@ -26390,9 +26390,10 @@ virDomainGraphicsDefFormat(virBuffer *buf,
                            virDomainGraphicsDef *def,
                            unsigned int flags)
 {
+    g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf);
     virDomainGraphicsListenDef *glisten =3D virDomainGraphicsGetListen(def=
, 0);
     const char *type =3D virDomainGraphicsTypeToString(def->type);
-    bool children =3D false;
     size_t i;
=20
     if (!type) {
@@ -26401,7 +26402,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
         return -1;
     }
=20
-    virBufferAsprintf(buf, "<graphics type=3D'%s'", type);
+    virBufferAsprintf(&attrBuf, " type=3D'%s'", type);
=20
     switch (def->type) {
     case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
@@ -26420,7 +26421,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
             if (glisten->socket &&
                 !((glisten->autoGenerated || glisten->fromConfig) &&
                   (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))) {
-                virBufferEscapeString(buf, " socket=3D'%s'", glisten->sock=
et);
+                virBufferEscapeString(&attrBuf, " socket=3D'%s'", glisten-=
>socket);
             }
             break;
=20
@@ -26428,90 +26429,84 @@ virDomainGraphicsDefFormat(virBuffer *buf,
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
             if (def->data.vnc.port &&
                 (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_DEF_FORMA=
T_INACTIVE)))
-                virBufferAsprintf(buf, " port=3D'%d'",
+                virBufferAsprintf(&attrBuf, " port=3D'%d'",
                                   def->data.vnc.port);
             else if (def->data.vnc.autoport)
-                virBufferAddLit(buf, " port=3D'-1'");
+                virBufferAddLit(&attrBuf, " port=3D'-1'");
=20
-            virBufferAsprintf(buf, " autoport=3D'%s'",
+            virBufferAsprintf(&attrBuf, " autoport=3D'%s'",
                               def->data.vnc.autoport ? "yes" : "no");
=20
             if (def->data.vnc.websocketGenerated &&
                 (flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
-                virBufferAddLit(buf, " websocket=3D'-1'");
+                virBufferAddLit(&attrBuf, " websocket=3D'-1'");
             else if (def->data.vnc.websocket)
-                virBufferAsprintf(buf, " websocket=3D'%d'", def->data.vnc.=
websocket);
+                virBufferAsprintf(&attrBuf, " websocket=3D'%d'", def->data=
.vnc.websocket);
=20
             if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS)
-                virBufferAsprintf(buf, " websocketGenerated=3D'%s'",
+                virBufferAsprintf(&attrBuf, " websocketGenerated=3D'%s'",
                                   def->data.vnc.websocketGenerated ? "yes"=
 : "no");
=20
-            virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
+            virDomainGraphicsListenDefFormatAddr(&attrBuf, glisten, flags);
             break;
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
             break;
         }
=20
-        virBufferEscapeString(buf, " keymap=3D'%s'",
+        virBufferEscapeString(&attrBuf, " keymap=3D'%s'",
                               def->data.vnc.keymap);
=20
         if (def->data.vnc.sharePolicy)
-            virBufferAsprintf(buf, " sharePolicy=3D'%s'",
+            virBufferAsprintf(&attrBuf, " sharePolicy=3D'%s'",
                               virDomainGraphicsVNCSharePolicyTypeToString(
                               def->data.vnc.sharePolicy));
=20
         if (def->data.vnc.powerControl)
-            virBufferAsprintf(buf, " powerControl=3D'%s'",
+            virBufferAsprintf(&attrBuf, " powerControl=3D'%s'",
                               virTristateBoolTypeToString(def->data.vnc.po=
werControl));
=20
-        virDomainGraphicsAuthDefFormatAttr(buf, &def->data.vnc.auth, flags=
);
+        virDomainGraphicsAuthDefFormatAttr(&attrBuf, &def->data.vnc.auth, =
flags);
         break;
=20
     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-        virBufferEscapeString(buf, " display=3D'%s'",
+        virBufferEscapeString(&attrBuf, " display=3D'%s'",
                               def->data.sdl.display);
=20
-        virBufferEscapeString(buf, " xauth=3D'%s'",
+        virBufferEscapeString(&attrBuf, " xauth=3D'%s'",
                               def->data.sdl.xauth);
         if (def->data.sdl.fullscreen)
-            virBufferAddLit(buf, " fullscreen=3D'yes'");
+            virBufferAddLit(&attrBuf, " fullscreen=3D'yes'");
=20
-        if (!children && def->data.sdl.gl !=3D VIR_TRISTATE_BOOL_ABSENT) {
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            children =3D true;
-        }
-
-        virDomainGraphicsDefFormatGL(buf, def->data.sdl.gl, NULL);
+        virDomainGraphicsDefFormatGL(&childBuf, def->data.sdl.gl, NULL);
         break;
=20
     case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
         if (def->data.rdp.port)
-            virBufferAsprintf(buf, " port=3D'%d'",
+            virBufferAsprintf(&attrBuf, " port=3D'%d'",
                               def->data.rdp.port);
         else if (def->data.rdp.autoport)
-            virBufferAddLit(buf, " port=3D'0'");
+            virBufferAddLit(&attrBuf, " port=3D'0'");
=20
         if (def->data.rdp.autoport)
-            virBufferAddLit(buf, " autoport=3D'yes'");
+            virBufferAddLit(&attrBuf, " autoport=3D'yes'");
=20
         if (def->data.rdp.replaceUser)
-            virBufferAddLit(buf, " replaceUser=3D'yes'");
+            virBufferAddLit(&attrBuf, " replaceUser=3D'yes'");
=20
         if (def->data.rdp.multiUser)
-            virBufferAddLit(buf, " multiUser=3D'yes'");
+            virBufferAddLit(&attrBuf, " multiUser=3D'yes'");
=20
-        virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
+        virDomainGraphicsListenDefFormatAddr(&attrBuf, glisten, flags);
=20
         break;
=20
     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-        virBufferEscapeString(buf, " display=3D'%s'",
+        virBufferEscapeString(&attrBuf, " display=3D'%s'",
                               def->data.desktop.display);
=20
         if (def->data.desktop.fullscreen)
-            virBufferAddLit(buf, " fullscreen=3D'yes'");
+            virBufferAddLit(&attrBuf, " fullscreen=3D'yes'");
=20
         break;
=20
@@ -26526,22 +26521,22 @@ virDomainGraphicsDefFormat(virBuffer *buf,
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
             if (def->data.spice.port)
-                virBufferAsprintf(buf, " port=3D'%d'",
+                virBufferAsprintf(&attrBuf, " port=3D'%d'",
                                   def->data.spice.port);
=20
             if (def->data.spice.tlsPort)
-                virBufferAsprintf(buf, " tlsPort=3D'%d'",
+                virBufferAsprintf(&attrBuf, " tlsPort=3D'%d'",
                                   def->data.spice.tlsPort);
=20
-            virBufferAsprintf(buf, " autoport=3D'%s'",
+            virBufferAsprintf(&attrBuf, " autoport=3D'%s'",
                               def->data.spice.autoport ? "yes" : "no");
=20
-            virDomainGraphicsListenDefFormatAddr(buf, glisten, flags);
+            virDomainGraphicsListenDefFormatAddr(&attrBuf, glisten, flags);
             break;
=20
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
             if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)
-                virBufferAddLit(buf, " autoport=3D'no'");
+                virBufferAddLit(&attrBuf, " autoport=3D'no'");
             break;
=20
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
@@ -26553,7 +26548,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
              * parsed as listen type "none". */
             if ((flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) &&
                 glisten->fromConfig) {
-                virBufferAddLit(buf, " autoport=3D'yes'");
+                virBufferAddLit(&attrBuf, " autoport=3D'yes'");
             }
             break;
=20
@@ -26561,48 +26556,31 @@ virDomainGraphicsDefFormat(virBuffer *buf,
             break;
         }
=20
-        virBufferEscapeString(buf, " keymap=3D'%s'",
+        virBufferEscapeString(&attrBuf, " keymap=3D'%s'",
                               def->data.spice.keymap);
=20
         if (def->data.spice.defaultMode !=3D VIR_DOMAIN_GRAPHICS_SPICE_CHA=
NNEL_MODE_ANY)
-            virBufferAsprintf(buf, " defaultMode=3D'%s'",
+            virBufferAsprintf(&attrBuf, " defaultMode=3D'%s'",
               virDomainGraphicsSpiceChannelModeTypeToString(def->data.spic=
e.defaultMode));
=20
-        virDomainGraphicsAuthDefFormatAttr(buf, &def->data.spice.auth, fla=
gs);
+        virDomainGraphicsAuthDefFormatAttr(&attrBuf, &def->data.spice.auth=
, flags);
         break;
=20
     case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-        if (!def->data.egl_headless.rendernode)
-            break;
-
-        if (!children) {
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            children =3D true;
-        }
-
-        virDomainGraphicsDefFormatGL(buf, VIR_TRISTATE_BOOL_ABSENT,
+        virDomainGraphicsDefFormatGL(&childBuf, VIR_TRISTATE_BOOL_ABSENT,
                                      def->data.egl_headless.rendernode);
         break;
     case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
         if (def->data.dbus.p2p)
-            virBufferAddLit(buf, " p2p=3D'yes'");
+            virBufferAddLit(&attrBuf, " p2p=3D'yes'");
         if (def->data.dbus.address)
-            virBufferAsprintf(buf, " address=3D'%s'",
+            virBufferAsprintf(&attrBuf, " address=3D'%s'",
                               def->data.dbus.address);
=20
-        if (!def->data.dbus.gl && def->data.dbus.audioId <=3D 0)
-            break;
+        virDomainGraphicsDefFormatGL(&childBuf, def->data.dbus.gl,
+                                     def->data.dbus.rendernode);
=20
-        if (!children) {
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            children =3D true;
-        }
-
-        virDomainGraphicsDefFormatGL(buf, def->data.dbus.gl, def->data.dbu=
s.rendernode);
-
-        virDomainGraphicsDefFormatAudio(buf, def->data.dbus.audioId);
+        virDomainGraphicsDefFormatAudio(&childBuf, def->data.dbus.audioId);
=20
         break;
     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
@@ -26635,83 +26613,54 @@ virDomainGraphicsDefFormat(virBuffer *buf,
                 def->listens[i].type =3D=3D VIR_DOMAIN_GRAPHICS_LISTEN_TYP=
E_NONE)
                 continue;
         }
-        if (!children) {
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            children =3D true;
-        }
-        virDomainGraphicsListenDefFormat(buf, &def->listens[i], flags);
+        virDomainGraphicsListenDefFormat(&childBuf, &def->listens[i], flag=
s);
     }
=20
     if (def->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
+        g_auto(virBuffer) spiceBuf =3D VIR_BUFFER_INITIALIZER;
+
         for (i =3D 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) {
             int mode =3D def->data.spice.channels[i];
             if (mode =3D=3D VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY)
                 continue;
=20
-            if (!children) {
-                virBufferAddLit(buf, ">\n");
-                virBufferAdjustIndent(buf, 2);
-                children =3D true;
-            }
-
-            virBufferAsprintf(buf, "<channel name=3D'%s' mode=3D'%s'/>\n",
+            virBufferAsprintf(&spiceBuf, " name=3D'%s' mode=3D'%s'",
                               virDomainGraphicsSpiceChannelNameTypeToStrin=
g(i),
                               virDomainGraphicsSpiceChannelModeTypeToStrin=
g(mode));
+
+            virXMLFormatElement(&childBuf, "channel", &spiceBuf, NULL);
         }
-        if (!children && (def->data.spice.image || def->data.spice.jpeg ||
-                          def->data.spice.zlib || def->data.spice.playback=
 ||
-                          def->data.spice.streaming || def->data.spice.cop=
ypaste ||
-                          def->data.spice.mousemode || def->data.spice.fil=
etransfer ||
-                          def->data.spice.gl)) {
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            children =3D true;
-        }
-        if (def->data.spice.image)
-            virBufferAsprintf(buf, "<image compression=3D'%s'/>\n",
-                              virDomainGraphicsSpiceImageCompressionTypeTo=
String(def->data.spice.image));
-        if (def->data.spice.jpeg)
-            virBufferAsprintf(buf, "<jpeg compression=3D'%s'/>\n",
-                              virDomainGraphicsSpiceJpegCompressionTypeToS=
tring(def->data.spice.jpeg));
-        if (def->data.spice.zlib)
-            virBufferAsprintf(buf, "<zlib compression=3D'%s'/>\n",
-                              virDomainGraphicsSpiceZlibCompressionTypeToS=
tring(def->data.spice.zlib));
-        if (def->data.spice.playback)
-            virBufferAsprintf(buf, "<playback compression=3D'%s'/>\n",
-                              virTristateSwitchTypeToString(def->data.spic=
e.playback));
-        if (def->data.spice.streaming)
-            virBufferAsprintf(buf, "<streaming mode=3D'%s'/>\n",
-                              virDomainGraphicsSpiceStreamingModeTypeToStr=
ing(def->data.spice.streaming));
-        if (def->data.spice.mousemode)
-            virBufferAsprintf(buf, "<mouse mode=3D'%s'/>\n",
-                              virDomainMouseModeTypeToString(def->data.spi=
ce.mousemode));
-        if (def->data.spice.copypaste)
-            virBufferAsprintf(buf, "<clipboard copypaste=3D'%s'/>\n",
-                              virTristateBoolTypeToString(def->data.spice.=
copypaste));
-        if (def->data.spice.filetransfer)
-            virBufferAsprintf(buf, "<filetransfer enable=3D'%s'/>\n",
-                              virTristateBoolTypeToString(def->data.spice.=
filetransfer));
=20
-        virDomainGraphicsDefFormatGL(buf, def->data.spice.gl, def->data.sp=
ice.rendernode);
-    }
+#define FORMAT_SPICE_FEATURE(name, attr, value, toStringFunc) \
+    if (value) { \
+        virBufferAsprintf(&spiceBuf, " " attr "=3D'%s'", toStringFunc(valu=
e)); \
+    } \
+    virXMLFormatElement(&childBuf, name, &spiceBuf, NULL);
=20
-    if (def->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
-        if (!children) {
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            children =3D true;
-        }
+        FORMAT_SPICE_FEATURE("image", "compression", def->data.spice.image,
+                             virDomainGraphicsSpiceImageCompressionTypeToS=
tring);
+        FORMAT_SPICE_FEATURE("jpeg", "compression", def->data.spice.jpeg,
+                             virDomainGraphicsSpiceJpegCompressionTypeToSt=
ring);
+        FORMAT_SPICE_FEATURE("zlib", "compression", def->data.spice.zlib,
+                             virDomainGraphicsSpiceZlibCompressionTypeToSt=
ring);
+        FORMAT_SPICE_FEATURE("playback", "compression", def->data.spice.pl=
ayback,
+                             virTristateSwitchTypeToString);
+        FORMAT_SPICE_FEATURE("streaming", "mode", def->data.spice.streamin=
g,
+                             virDomainGraphicsSpiceStreamingModeTypeToStri=
ng);
+        FORMAT_SPICE_FEATURE("mouse", "mode", def->data.spice.mousemode,
+                             virDomainMouseModeTypeToString);
+        FORMAT_SPICE_FEATURE("clipboard", "copypaste", def->data.spice.cop=
ypaste,
+                             virTristateBoolTypeToString);
+        FORMAT_SPICE_FEATURE("filetransfer", "enable", def->data.spice.fil=
etransfer,
+                             virTristateBoolTypeToString);
=20
-        virDomainGraphicsDefFormatAudio(buf, def->data.vnc.audioId);
+        virDomainGraphicsDefFormatGL(&childBuf, def->data.spice.gl, def->d=
ata.spice.rendernode);
     }
=20
-    if (children) {
-        virBufferAdjustIndent(buf, -2);
-        virBufferAddLit(buf, "</graphics>\n");
-    } else {
-        virBufferAddLit(buf, "/>\n");
-    }
+    if (def->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_VNC)
+        virDomainGraphicsDefFormatAudio(&childBuf, def->data.vnc.audioId);
+
+    virXMLFormatElement(buf, "graphics", &attrBuf, &childBuf);
=20
     return 0;
 }
--=20
2.48.1