From nobody Wed Mar 12 17:33:47 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 1741264033245260.5821510286081; Thu, 6 Mar 2025 04:27:13 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2E0201816; Thu, 6 Mar 2025 07:27:12 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0ED6F17DE; Thu, 6 Mar 2025 07:23:22 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D64AC1828; Thu, 6 Mar 2025 07:23:15 -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 6AD0617BC for ; Thu, 6 Mar 2025 07:22:53 -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-513-ai2JUUMxPr2PJzB-wl6NJg-1; Thu, 06 Mar 2025 07:22:51 -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 27E771955F30 for ; Thu, 6 Mar 2025 12:22:51 +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 50BDB300019E for ; Thu, 6 Mar 2025 12:22:50 +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=1741263773; 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=iin1ee6tQLNmEjwtV2vv0KhyOgVQ6gyK1y1ilmSRSJg=; b=Egi4GCMtVxmGiEFyM5wgEzY5EcgvzIntIAACa75CVAMnohf0LMieiT8OBmqEc93BmHZGU6 5HH6eBg4/y4rRkfucj4AJbXe8UffYalWVrpItUko3Fj0uJ11Z3V4onrpgNlGQiqMv8Ifex G5bnJaO0FooNV0knpG+uMPB3bjGUssQ= X-MC-Unique: ai2JUUMxPr2PJzB-wl6NJg-1 X-Mimecast-MFC-AGG-ID: ai2JUUMxPr2PJzB-wl6NJg_1741263771 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 14/16] domain_conf: graphics: move remaining VNC formatting Date: Thu, 6 Mar 2025 13:22:22 +0100 Message-ID: <3f812347af2385150d1405475b21967adc17f623.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: ezFvhb8SAG4V0lGciQjid__TH4zNw92R9Jah7YH7wYA_1741263771 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DMJWEFIGLEN73L6ETDMJCE3MSOGRRRCP X-Message-ID-Hash: DMJWEFIGLEN73L6ETDMJCE3MSOGRRRCP 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: 1741264035856019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Now we are able to move the rest into virDomainGraphicsDefFormatVNC without breaking order of elements in the resulting XML. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34ed62cc99..27323ea768 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26493,6 +26493,8 @@ virDomainGraphicsDefFormatVNC(virBuffer *attrBuf, =20 virDomainGraphicsDefFormatListnes(childBuf, def, flags); =20 + virDomainGraphicsDefFormatAudio(childBuf, def->data.vnc.audioId); + return 0; } =20 @@ -26728,9 +26730,6 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; } =20 - if (def->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_VNC) - virDomainGraphicsDefFormatAudio(&childBuf, def->data.vnc.audioId); - virXMLFormatElement(buf, "graphics", &attrBuf, &childBuf); =20 return 0; --=20 2.48.1