From nobody Wed Mar 12 17:57:41 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: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741263788114431.443742424001; Thu, 6 Mar 2025 04:23:08 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id EDDE517C4; Thu, 6 Mar 2025 07:23:06 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7E6E915D6; Thu, 6 Mar 2025 07:22:40 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 26EE51596; Thu, 6 Mar 2025 07:22:38 -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 D661812B5 for ; Thu, 6 Mar 2025 07:22:36 -0500 (EST) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-59-w7UCv3fNMbWl4PHqOjQXBA-1; Thu, 06 Mar 2025 07:22:34 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC43B19560A1 for ; Thu, 6 Mar 2025 12:22:33 +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 1FA81300019E for ; Thu, 6 Mar 2025 12:22:32 +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=1741263756; 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=buNBPIcmIyApbe0FMI4vVe9ofPC/yMpCYuNMXS5qCjw=; b=KGagi+BsGNcIsKfI1ToZQMjppG6aBWFYS/sEub1IewvxS9ZuTiC+PjQ8klnAoJ2H8u3qfr 45EnzotIxNjhdqet6LqCW9ONP0bxbP7MqazZPmcEfdVF2XzD/ap9xsON9jnKqsmfcGcY6J sB7bmU0t9GtgC5KaXhl7DFN2OteQUyw= X-MC-Unique: w7UCv3fNMbWl4PHqOjQXBA-1 X-Mimecast-MFC-AGG-ID: w7UCv3fNMbWl4PHqOjQXBA_1741263754 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 01/16] domain_conf: graphics: use a function to format gl element Date: Thu, 6 Mar 2025 13:22:09 +0100 Message-ID: In-Reply-To: References: 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: HZEhUqkvNcXgF6X4RFx_9gkLCxGW_32kRr8MA6JIxjk_1741263754 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ULPZSYB2W3HEBBQYMR7VLLOTTQ4GWMT5 X-Message-ID-Hash: ULPZSYB2W3HEBBQYMR7VLLOTTQ4GWMT5 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 Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741263789394019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Removes code duplication. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f42b7075ad..850fe7e90b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26357,14 +26357,21 @@ virDomainGraphicsListenDefFormatAddr(virBuffer *b= uf, } =20 static void -virDomainSpiceGLDefFormat(virBuffer *buf, virDomainGraphicsDef *def) +virDomainGraphicsDefFormatGL(virBuffer *buf, + virTristateBool gl, + char *rendernode) { - if (def->data.spice.gl =3D=3D VIR_TRISTATE_BOOL_ABSENT) + if (gl =3D=3D VIR_TRISTATE_BOOL_ABSENT && !rendernode) return; =20 - virBufferAsprintf(buf, "data.spice.gl)); - virBufferEscapeString(buf, " rendernode=3D'%s'", def->data.spice.rende= rnode); + virBufferAddLit(buf, "\n"); } =20 @@ -26466,12 +26473,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, children =3D true; } =20 - if (def->data.sdl.gl !=3D VIR_TRISTATE_BOOL_ABSENT) { - virBufferAsprintf(buf, "data.sdl.gl= )); - virBufferAddLit(buf, "/>\n"); - } - + virDomainGraphicsDefFormatGL(buf, def->data.sdl.gl, NULL); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_RDP: @@ -26569,10 +26571,8 @@ virDomainGraphicsDefFormat(virBuffer *buf, children =3D true; } =20 - virBufferAddLit(buf, "data.egl_headless.rendernode); - virBufferAddLit(buf, "/>\n"); + virDomainGraphicsDefFormatGL(buf, VIR_TRISTATE_BOOL_ABSENT, + def->data.egl_headless.rendernode); break; case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: if (def->data.dbus.p2p) @@ -26590,12 +26590,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, children =3D true; } =20 - if (def->data.dbus.gl) { - virBufferAsprintf(buf, "data.dbus.g= l)); - virBufferEscapeString(buf, " rendernode=3D'%s'", def->data.dbu= s.rendernode); - virBufferAddLit(buf, "/>\n"); - } + virDomainGraphicsDefFormatGL(buf, def->data.dbus.gl, def->data.dbu= s.rendernode); =20 if (def->data.dbus.audioId > 0) virBufferAsprintf(buf, "