From nobody Wed Mar 12 17:31:58 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 1741264051775427.2711987972589; Thu, 6 Mar 2025 04:27:31 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A4F7D15D6; Thu, 6 Mar 2025 07:27:30 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 518B817D7; Thu, 6 Mar 2025 07:23:27 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E17471874; Thu, 6 Mar 2025 07:23:21 -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 B6E581626 for ; Thu, 6 Mar 2025 07:22:55 -0500 (EST) Received: from mx-prod-mc-04.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-461-gqZoNI8sMTO68YRqPZ42Pg-1; Thu, 06 Mar 2025 07:22:49 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6FEFA19560BB for ; Thu, 6 Mar 2025 12:22:48 +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 9A2B6300019E for ; Thu, 6 Mar 2025 12:22:47 +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=1741263775; 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=ZWKi/Lf9zVwugfh//uZ22RwGtT0Mf9PR28INU+SqiGU=; b=WbnS2zPqbMo0/gI9zcnd3AP8yrBu6gIHhi3wk1OAmrh8lTHElciv5C2N/LPkEGIN/MUL5Q KSQCtB9dFLXaBiZKlklVLBXsYKcLj8zxfO6CPXMQsSiD+/LHMypSH7p2bLEqlKAgFomF8y WGbZ0YTA2mVEOgFytKpe/Q7aA01BBtM= X-MC-Unique: gqZoNI8sMTO68YRqPZ42Pg-1 X-Mimecast-MFC-AGG-ID: gqZoNI8sMTO68YRqPZ42Pg_1741263768 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 12/16] domain_conf: graphics: move listens formatting to relevant graphics types Date: Thu, 6 Mar 2025 13:22:20 +0100 Message-ID: <727daf7224f996038573be25c084e1bdddcf2379.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: Jf2ztLSSbs4m60Mr6n6xtqKi9cBVYljeRp99H_A3ySU_1741263768 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UGOQMG4F5ODFTV2TQ5MBRSPH67UFYZ5W X-Message-ID-Hash: UGOQMG4F5ODFTV2TQ5MBRSPH67UFYZ5W 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: 1741264053950019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Only VNC, RDP and Spice graphics types are using listen elements so call the function only where it is needed. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d39b885101..ad3a44b9b1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26425,6 +26425,7 @@ virDomainGraphicsDefFormatAudio(virBuffer *buf, =20 static int virDomainGraphicsDefFormatVNC(virBuffer *attrBuf, + virBuffer *childBuf, virDomainGraphicsDef *def, unsigned int flags) { @@ -26490,6 +26491,8 @@ virDomainGraphicsDefFormatVNC(virBuffer *attrBuf, =20 virDomainGraphicsAuthDefFormatAttr(attrBuf, &def->data.vnc.auth, flags= ); =20 + virDomainGraphicsDefFormatListnes(childBuf, def, flags); + return 0; } =20 @@ -26510,6 +26513,7 @@ virDomainGraphicsDefFormatSDL(virBuffer *attrBuf, =20 static void virDomainGraphicsDefFormatRDP(virBuffer *attrBuf, + virBuffer *childBuf, virDomainGraphicsDef *def, unsigned int flags) { @@ -26530,6 +26534,8 @@ virDomainGraphicsDefFormatRDP(virBuffer *attrBuf, virBufferAddLit(attrBuf, " multiUser=3D'yes'"); =20 virDomainGraphicsListenDefFormatAddr(attrBuf, glisten, flags); + + virDomainGraphicsDefFormatListnes(childBuf, def, flags); } =20 static void @@ -26544,6 +26550,7 @@ virDomainGraphicsDefFormatDesktop(virBuffer *attrBu= f, =20 static int virDomainGraphicsDefFormatSpice(virBuffer *attrBuf, + virBuffer *childBuf, virDomainGraphicsDef *def, unsigned int flags) { @@ -26600,6 +26607,8 @@ virDomainGraphicsDefFormatSpice(virBuffer *attrBuf, =20 virDomainGraphicsAuthDefFormatAttr(attrBuf, &def->data.spice.auth, fla= gs); =20 + virDomainGraphicsDefFormatListnes(childBuf, def, flags); + return 0; } =20 @@ -26648,7 +26657,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, =20 switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - if (virDomainGraphicsDefFormatVNC(&attrBuf, def, flags) < 0) + if (virDomainGraphicsDefFormatVNC(&attrBuf, &childBuf, def, flags)= < 0) return -1; break; =20 @@ -26657,7 +26666,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_RDP: - virDomainGraphicsDefFormatRDP(&attrBuf, def, flags); + virDomainGraphicsDefFormatRDP(&attrBuf, &childBuf, def, flags); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: @@ -26665,7 +26674,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: - if (virDomainGraphicsDefFormatSpice(&attrBuf, def, flags) < 0) + if (virDomainGraphicsDefFormatSpice(&attrBuf, &childBuf, def, flag= s) < 0) return -1; break; =20 @@ -26681,8 +26690,6 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; } =20 - virDomainGraphicsDefFormatListnes(&childBuf, def, flags); - if (def->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { g_auto(virBuffer) spiceBuf =3D VIR_BUFFER_INITIALIZER; =20 --=20 2.48.1