From nobody Wed Mar 12 17:58:29 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 1741264015988613.4469153674969; Thu, 6 Mar 2025 04:26:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id DF0C6182B; Thu, 6 Mar 2025 07:26:54 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 630EA18B1; Thu, 6 Mar 2025 07:23:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5321B1777; Thu, 6 Mar 2025 07:23:14 -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 078BB15D9 for ; Thu, 6 Mar 2025 07:22:51 -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-135-CocYw2z_ODCAQSHc_YsHKA-1; Thu, 06 Mar 2025 07:22:50 -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 CDE7719560BB for ; Thu, 6 Mar 2025 12:22:49 +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 03595300019E for ; Thu, 6 Mar 2025 12:22:48 +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=1741263771; 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=jmQbFVTma1bhiOpRRQ4SiN5KvEn9go4bXcSdoV/wUMU=; b=Ub9/kU0GnbIvhdip+mDzJ1DGvqIMrNK22xOqiMwZU5dp0ieHErx5klglo8nEMn5737EHKI WV2n9okhDJQFWjMxaHbE29Me8gJYQCUZz1iy6CW/ZlMNBRFdCDy/7C8MNkS5BlW25vY4Oe W1XqZvZQWn7TjbVPMG65kbpV5heDoD0= X-MC-Unique: CocYw2z_ODCAQSHc_YsHKA-1 X-Mimecast-MFC-AGG-ID: CocYw2z_ODCAQSHc_YsHKA_1741263769 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 13/16] domain_conf: graphics: move remaining spice formatting Date: Thu, 6 Mar 2025 13:22:21 +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: Y9yYKBT1qShBsCnsollR5of2hLb_3evDIZtWC63rUPo_1741263769 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UELRNSBKG4JWH3HMIBQLQLSMBVKEAGPJ X-Message-ID-Hash: UELRNSBKG4JWH3HMIBQLQLSMBVKEAGPJ 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: 1741264017934019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Now we are able to move the rest into virDomainGraphicsDefFormatSpice without breaking order of elements in the resulting XML. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 81 ++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ad3a44b9b1..34ed62cc99 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26554,7 +26554,9 @@ virDomainGraphicsDefFormatSpice(virBuffer *attrBuf, virDomainGraphicsDef *def, unsigned int flags) { + g_auto(virBuffer) spiceBuf =3D VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDef *glisten =3D virDomainGraphicsGetListen(def= , 0); + size_t i; =20 if (!glisten) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -26609,6 +26611,43 @@ virDomainGraphicsDefFormatSpice(virBuffer *attrBuf, =20 virDomainGraphicsDefFormatListnes(childBuf, def, flags); =20 + for (i =3D 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) { + int mode =3D def->data.spice.channels[i]; + if (mode =3D=3D VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY) + continue; + + virBufferAsprintf(&spiceBuf, " name=3D'%s' mode=3D'%s'", + virDomainGraphicsSpiceChannelNameTypeToString(i), + virDomainGraphicsSpiceChannelModeTypeToString(mo= de)); + + virXMLFormatElement(childBuf, "channel", &spiceBuf, NULL); + } + +#define FORMAT_SPICE_FEATURE(name, attr, value, toStringFunc) \ + if (value) { \ + virBufferAsprintf(&spiceBuf, " " attr "=3D'%s'", toStringFunc(valu= e)); \ + } \ + virXMLFormatElement(childBuf, name, &spiceBuf, NULL); + + FORMAT_SPICE_FEATURE("image", "compression", def->data.spice.image, + virDomainGraphicsSpiceImageCompressionTypeToStrin= g); + FORMAT_SPICE_FEATURE("jpeg", "compression", def->data.spice.jpeg, + virDomainGraphicsSpiceJpegCompressionTypeToString= ); + FORMAT_SPICE_FEATURE("zlib", "compression", def->data.spice.zlib, + virDomainGraphicsSpiceZlibCompressionTypeToString= ); + FORMAT_SPICE_FEATURE("playback", "compression", def->data.spice.playba= ck, + virTristateSwitchTypeToString); + FORMAT_SPICE_FEATURE("streaming", "mode", def->data.spice.streaming, + virDomainGraphicsSpiceStreamingModeTypeToString); + FORMAT_SPICE_FEATURE("mouse", "mode", def->data.spice.mousemode, + virDomainMouseModeTypeToString); + FORMAT_SPICE_FEATURE("clipboard", "copypaste", def->data.spice.copypas= te, + virTristateBoolTypeToString); + FORMAT_SPICE_FEATURE("filetransfer", "enable", def->data.spice.filetra= nsfer, + virTristateBoolTypeToString); + + virDomainGraphicsDefFormatGL(childBuf, def->data.spice.gl, def->data.s= pice.rendernode); + return 0; } =20 @@ -26645,7 +26684,6 @@ virDomainGraphicsDefFormat(virBuffer *buf, g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); const char *type =3D virDomainGraphicsTypeToString(def->type); - size_t i; =20 if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -26690,47 +26728,6 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; } =20 - if (def->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - g_auto(virBuffer) spiceBuf =3D VIR_BUFFER_INITIALIZER; - - for (i =3D 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) { - int mode =3D def->data.spice.channels[i]; - if (mode =3D=3D VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY) - continue; - - virBufferAsprintf(&spiceBuf, " name=3D'%s' mode=3D'%s'", - virDomainGraphicsSpiceChannelNameTypeToStrin= g(i), - virDomainGraphicsSpiceChannelModeTypeToStrin= g(mode)); - - virXMLFormatElement(&childBuf, "channel", &spiceBuf, NULL); - } - -#define FORMAT_SPICE_FEATURE(name, attr, value, toStringFunc) \ - if (value) { \ - virBufferAsprintf(&spiceBuf, " " attr "=3D'%s'", toStringFunc(valu= e)); \ - } \ - virXMLFormatElement(&childBuf, name, &spiceBuf, NULL); - - FORMAT_SPICE_FEATURE("image", "compression", def->data.spice.image, - virDomainGraphicsSpiceImageCompressionTypeToS= tring); - FORMAT_SPICE_FEATURE("jpeg", "compression", def->data.spice.jpeg, - virDomainGraphicsSpiceJpegCompressionTypeToSt= ring); - FORMAT_SPICE_FEATURE("zlib", "compression", def->data.spice.zlib, - virDomainGraphicsSpiceZlibCompressionTypeToSt= ring); - FORMAT_SPICE_FEATURE("playback", "compression", def->data.spice.pl= ayback, - virTristateSwitchTypeToString); - FORMAT_SPICE_FEATURE("streaming", "mode", def->data.spice.streamin= g, - virDomainGraphicsSpiceStreamingModeTypeToStri= ng); - FORMAT_SPICE_FEATURE("mouse", "mode", def->data.spice.mousemode, - virDomainMouseModeTypeToString); - FORMAT_SPICE_FEATURE("clipboard", "copypaste", def->data.spice.cop= ypaste, - virTristateBoolTypeToString); - FORMAT_SPICE_FEATURE("filetransfer", "enable", def->data.spice.fil= etransfer, - virTristateBoolTypeToString); - - virDomainGraphicsDefFormatGL(&childBuf, def->data.spice.gl, def->d= ata.spice.rendernode); - } - if (def->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_VNC) virDomainGraphicsDefFormatAudio(&childBuf, def->data.vnc.audioId); =20 --=20 2.48.1