From nobody Wed Mar 12 17:27:27 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 1741264104550700.2120185477178; Thu, 6 Mar 2025 04:28:24 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6AE8012BE; Thu, 6 Mar 2025 07:28:23 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1B4CF18D6; Thu, 6 Mar 2025 07:23:34 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id CCA3B170D; Thu, 6 Mar 2025 07:23:22 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 CCBD4162A for ; Thu, 6 Mar 2025 07:22:56 -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-642-zSv8QKxsMsqzCY009sNY_A-1; Thu, 06 Mar 2025 07:22:45 -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 83115180035E for ; Thu, 6 Mar 2025 12:22:44 +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 B2075300019E for ; Thu, 6 Mar 2025 12:22:43 +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_H2,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=1741263776; 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=zvGmMoo7cQckAw2009R5t8GM7fgDBb23wTh1cYBM4RI=; b=VBs1ZU7DxN0+gO2EsKFP/nD5FhMc0jLi06rhaXUKkvJpAm6ieN9XfKIqYg7BakLjo7CBwR a6zU32AF6FWaEBe/TMixkcJsHSA4OxpCISKGFor+kdm/6/sD8R5K8Ijslk2sD7lB8Wlfah /8heNRNpfCd/n+u3PKfB13ebfwhPNWQ= X-MC-Unique: zSv8QKxsMsqzCY009sNY_A-1 X-Mimecast-MFC-AGG-ID: zSv8QKxsMsqzCY009sNY_A_1741263764 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 09/16] domain_conf: graphics: extract EGL-Headless formatting to separate function Date: Thu, 6 Mar 2025 13:22:17 +0100 Message-ID: <6bc4bba3e455d47d91607f8e7cde0942bd57ac90.1741263715.git.phrdina@redhat.com> 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: Kdm-m4fxoQqWwb4OdTrDU7pDTlE5A782pnQHElt6Opk_1741263764 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RO7NCJIDVDSEUABNBQCNZ22U5C54JSCG X-Message-ID-Hash: RO7NCJIDVDSEUABNBQCNZ22U5C54JSCG 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: 1741264106146019100 Content-Type: text/plain; charset="utf-8"; x-default="true" virDomainGraphicsDefFormat function was way too long so split it into separate functions for each graphics type. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 636d4a5099..83dccd87f1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26565,6 +26565,14 @@ virDomainGraphicsDefFormatSpice(virBuffer *attrBuf, return 0; } =20 +static void +virDomainGraphicsDefFormatEGLHeadless(virBuffer *childBuf, + virDomainGraphicsDef *def) +{ + virDomainGraphicsDefFormatGL(childBuf, VIR_TRISTATE_BOOL_ABSENT, + def->data.egl_headless.rendernode); +} + static int virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDef *def, @@ -26607,9 +26615,9 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: - virDomainGraphicsDefFormatGL(&childBuf, VIR_TRISTATE_BOOL_ABSENT, - def->data.egl_headless.rendernode); + virDomainGraphicsDefFormatEGLHeadless(&childBuf, def); break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: if (def->data.dbus.p2p) virBufferAddLit(&attrBuf, " p2p=3D'yes'"); --=20 2.48.1