From nobody Wed Mar 12 17:42:09 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 174126391938529.795855853722628; Thu, 6 Mar 2025 04:25:19 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B53AE185E; Thu, 6 Mar 2025 07:25:18 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A14A11877; Thu, 6 Mar 2025 07:22:59 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3DE0E1658; Thu, 6 Mar 2025 07:22:54 -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 2E78B17D9 for ; Thu, 6 Mar 2025 07:22:43 -0500 (EST) Received: from mx-prod-mc-01.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-659-69Ia31jvObuu-TtZZbPnsw-1; Thu, 06 Mar 2025 07:22:41 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9BD7519560B0 for ; Thu, 6 Mar 2025 12:22:40 +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 CAAAB300019E for ; Thu, 6 Mar 2025 12:22:39 +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=1741263762; 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=aLeA8vuIRuESIskm41lisvhq9egky6jafK8EXkHcVwk=; b=NELjRMbz+sYkSdb0UpD1phnNZj9D5kzS7YrHKaHJLlRX0pca127NEQtaKg2YOSv5a9W2vm uCbe1LBmn4t5+MGtNAfSkOfRZ42paod5JDByBLXq5OQK+wpu1hmIdAk1QZm5zdqmVhCkBt Hu36nLenCKAEqTvQS6d8xhPs41iqlNc= X-MC-Unique: 69Ia31jvObuu-TtZZbPnsw-1 X-Mimecast-MFC-AGG-ID: 69Ia31jvObuu-TtZZbPnsw_1741263760 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 06/16] domain_conf: graphics: extract RDP formatting to separate function Date: Thu, 6 Mar 2025 13:22:14 +0100 Message-ID: <17af999797d4a7b7e48b494301274f2987f0f854.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: FGrNWVHDCLKyvlqtpoicC0iFexGIENRNAa-mFSvO0ag_1741263760 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FIYBOT4L74GVH5WWSKSGQNK5JGJKB54U X-Message-ID-Hash: FIYBOT4L74GVH5WWSKSGQNK5JGJKB54U 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: 1741263921417019000 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 | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4314ef4dc4..9400206e8f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26470,6 +26470,30 @@ virDomainGraphicsDefFormatSDL(virBuffer *attrBuf, virDomainGraphicsDefFormatGL(childBuf, def->data.sdl.gl, NULL); } =20 +static void +virDomainGraphicsDefFormatRDP(virBuffer *attrBuf, + virDomainGraphicsDef *def, + unsigned int flags) +{ + virDomainGraphicsListenDef *glisten =3D virDomainGraphicsGetListen(def= , 0); + + if (def->data.rdp.port) + virBufferAsprintf(attrBuf, " port=3D'%d'", def->data.rdp.port); + else if (def->data.rdp.autoport) + virBufferAddLit(attrBuf, " port=3D'0'"); + + if (def->data.rdp.autoport) + virBufferAddLit(attrBuf, " autoport=3D'yes'"); + + if (def->data.rdp.replaceUser) + virBufferAddLit(attrBuf, " replaceUser=3D'yes'"); + + if (def->data.rdp.multiUser) + virBufferAddLit(attrBuf, " multiUser=3D'yes'"); + + virDomainGraphicsListenDefFormatAddr(attrBuf, glisten, flags); +} + static int virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDef *def, @@ -26500,23 +26524,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_RDP: - if (def->data.rdp.port) - virBufferAsprintf(&attrBuf, " port=3D'%d'", - def->data.rdp.port); - else if (def->data.rdp.autoport) - virBufferAddLit(&attrBuf, " port=3D'0'"); - - if (def->data.rdp.autoport) - virBufferAddLit(&attrBuf, " autoport=3D'yes'"); - - if (def->data.rdp.replaceUser) - virBufferAddLit(&attrBuf, " replaceUser=3D'yes'"); - - if (def->data.rdp.multiUser) - virBufferAddLit(&attrBuf, " multiUser=3D'yes'"); - - virDomainGraphicsListenDefFormatAddr(&attrBuf, glisten, flags); - + virDomainGraphicsDefFormatRDP(&attrBuf, def, flags); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: --=20 2.48.1