From nobody Sun Feb 8 18:51:02 2026 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 1741263990877876.7849518764234; Thu, 6 Mar 2025 04:26:30 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 401E2A56; Thu, 6 Mar 2025 07:26:30 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 15F721895; Thu, 6 Mar 2025 07:23:14 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1F6891791; Thu, 6 Mar 2025 07:23:08 -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 A03A9176F for ; Thu, 6 Mar 2025 07:22:49 -0500 (EST) Received: from mx-prod-mc-08.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-588-PXHwrGr8ME2_p6BFzYV_PA-1; Thu, 06 Mar 2025 07:22:42 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EA462180899B for ; Thu, 6 Mar 2025 12:22:41 +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 215B9300019E for ; Thu, 6 Mar 2025 12:22:40 +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=1741263769; 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=+Wah7cuY9y0M8vVwJd/8WjwcuPHs8jgYSMggXi4gmh8=; b=Ge4RUKWQ5RZV9iK87JLql2R31qspXK+L4pZm8VVkPbw7ENbOyjner9/PIOyhTnAd274FyX FJCsFZ9rshpFKpJjvUTWKWPLJ12q3OsqOklsByNRjqTvbMj1Gegniq6kB/W7vZ46YGk6Mo RkS1aE5qnUP7EC+YxAXA+m5tzWC9XD4= X-MC-Unique: PXHwrGr8ME2_p6BFzYV_PA-1 X-Mimecast-MFC-AGG-ID: PXHwrGr8ME2_p6BFzYV_PA_1741263762 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 07/16] domain_conf: graphics: extract Desktop formatting to separate function Date: Thu, 6 Mar 2025 13:22:15 +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: napIIyeSEd2sX3otPTnitxYWxtIFGT2gPWAUxx9993M_1741263762 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3GQOVVSCVIFBUISIA5FHRIPBSCH4WAM6 X-Message-ID-Hash: 3GQOVVSCVIFBUISIA5FHRIPBSCH4WAM6 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: 1741263991857019000 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 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9400206e8f..3edeffbe72 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26494,6 +26494,16 @@ virDomainGraphicsDefFormatRDP(virBuffer *attrBuf, virDomainGraphicsListenDefFormatAddr(attrBuf, glisten, flags); } =20 +static void +virDomainGraphicsDefFormatDesktop(virBuffer *attrBuf, + virDomainGraphicsDef *def) +{ + virBufferEscapeString(attrBuf, " display=3D'%s'", def->data.desktop.di= splay); + + if (def->data.desktop.fullscreen) + virBufferAddLit(attrBuf, " fullscreen=3D'yes'"); +} + static int virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDef *def, @@ -26528,12 +26538,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - virBufferEscapeString(&attrBuf, " display=3D'%s'", - def->data.desktop.display); - - if (def->data.desktop.fullscreen) - virBufferAddLit(&attrBuf, " fullscreen=3D'yes'"); - + virDomainGraphicsDefFormatDesktop(&attrBuf, def); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: --=20 2.48.1