From nobody Wed Mar 12 17:38:56 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 1741263880433754.3116715310274; Thu, 6 Mar 2025 04:24:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id D647C15BF; Thu, 6 Mar 2025 07:24:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F0EB81855; Thu, 6 Mar 2025 07:22:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 137DA1784; Thu, 6 Mar 2025 07:22:50 -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 A38311758 for ; Thu, 6 Mar 2025 07:22:41 -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-271-dEF5o9hENVymNvPdQ-VqYg-1; Thu, 06 Mar 2025 07:22:38 -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 151171955D81 for ; Thu, 6 Mar 2025 12:22:38 +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 4C7A8300019E for ; Thu, 6 Mar 2025 12:22:37 +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=1741263761; 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=tdk4zDx9IDTfofa77wetZoV+1FIWXJ486Py6G5u6QA4=; b=I4y94ly8/5XBtwqoucDgeEJrXBA8ozXaJ4StrknPqoPSlIfHvh2iXfulZ+ZHudrUI7IfBK YWz2s7yAGKXpoqgyh4r2171TniksMNyAGIhNMBc5xHKZxQmWCUeSKWaPsqC4gZu+mzcPvC b7E5dwvXk9nDVB84nLpe5E1W/9JlmsI= X-MC-Unique: dEF5o9hENVymNvPdQ-VqYg-1 X-Mimecast-MFC-AGG-ID: dEF5o9hENVymNvPdQ-VqYg_1741263758 From: Pavel Hrdina To: devel@lists.libvirt.org Subject: [libvirt PATCH 04/16] domain_conf: graphics: extract VNC formatting to separate function Date: Thu, 6 Mar 2025 13:22:12 +0100 Message-ID: <8ff557ac079171cc6c817d3920c62318ab8c1f5e.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: grG53jO8BKx_6orWO5drxYtw6oVvxDjdka0AGZai6uA_1741263758 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZRQWEQJ67MOCADSC5Q6IYCCIJUOTY6ZQ X-Message-ID-Hash: ZRQWEQJ67MOCADSC5Q6IYCCIJUOTY6ZQ 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: 1741263881305019000 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 | 131 ++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 60 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8de39e7767..e1589527f2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26385,6 +26385,76 @@ virDomainGraphicsDefFormatAudio(virBuffer *buf, virXMLFormatElement(buf, "audio", &attrBuf, NULL); } =20 +static int +virDomainGraphicsDefFormatVNC(virBuffer *attrBuf, + virDomainGraphicsDef *def, + unsigned int flags) +{ + virDomainGraphicsListenDef *glisten =3D virDomainGraphicsGetListen(def= , 0); + + if (!glisten) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing listen element for graphics")); + return -1; + } + + switch (glisten->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + /* To not break migration we shouldn't print the 'socket' attribute + * if it's auto-generated or if it's based on config option from + * qemu.conf. If the socket is provided by user we need to print = it + * into migratable XML. */ + if (glisten->socket && + !((glisten->autoGenerated || glisten->fromConfig) && + (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))) { + virBufferEscapeString(attrBuf, " socket=3D'%s'", glisten->sock= et); + } + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + if (def->data.vnc.port && + (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_DEF_FORMAT_IN= ACTIVE))) + virBufferAsprintf(attrBuf, " port=3D'%d'", def->data.vnc.port); + else if (def->data.vnc.autoport) + virBufferAddLit(attrBuf, " port=3D'-1'"); + + virBufferAsprintf(attrBuf, " autoport=3D'%s'", + def->data.vnc.autoport ? "yes" : "no"); + + if (def->data.vnc.websocketGenerated && + (flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) + virBufferAddLit(attrBuf, " websocket=3D'-1'"); + else if (def->data.vnc.websocket) + virBufferAsprintf(attrBuf, " websocket=3D'%d'", def->data.vnc.= websocket); + + if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS) + virBufferAsprintf(attrBuf, " websocketGenerated=3D'%s'", + def->data.vnc.websocketGenerated ? "yes" : "= no"); + + virDomainGraphicsListenDefFormatAddr(attrBuf, glisten, flags); + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; + } + + virBufferEscapeString(attrBuf, " keymap=3D'%s'", def->data.vnc.keymap); + + if (def->data.vnc.sharePolicy) + virBufferAsprintf(attrBuf, " sharePolicy=3D'%s'", + virDomainGraphicsVNCSharePolicyTypeToString( + def->data.vnc.sharePolicy)); + + if (def->data.vnc.powerControl) + virBufferAsprintf(attrBuf, " powerControl=3D'%s'", + virTristateBoolTypeToString(def->data.vnc.powerC= ontrol)); + + virDomainGraphicsAuthDefFormatAttr(attrBuf, &def->data.vnc.auth, flags= ); + + return 0; +} + static int virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDef *def, @@ -26406,67 +26476,8 @@ virDomainGraphicsDefFormat(virBuffer *buf, =20 switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - if (!glisten) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing listen element for graphics")); + if (virDomainGraphicsDefFormatVNC(&attrBuf, def, flags) < 0) return -1; - } - - switch (glisten->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - /* To not break migration we shouldn't print the 'socket' attr= ibute - * if it's auto-generated or if it's based on config option fr= om - * qemu.conf. If the socket is provided by user we need to pr= int it - * into migratable XML. */ - if (glisten->socket && - !((glisten->autoGenerated || glisten->fromConfig) && - (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))) { - virBufferEscapeString(&attrBuf, " socket=3D'%s'", glisten-= >socket); - } - break; - - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - if (def->data.vnc.port && - (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_DEF_FORMA= T_INACTIVE))) - virBufferAsprintf(&attrBuf, " port=3D'%d'", - def->data.vnc.port); - else if (def->data.vnc.autoport) - virBufferAddLit(&attrBuf, " port=3D'-1'"); - - virBufferAsprintf(&attrBuf, " autoport=3D'%s'", - def->data.vnc.autoport ? "yes" : "no"); - - if (def->data.vnc.websocketGenerated && - (flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) - virBufferAddLit(&attrBuf, " websocket=3D'-1'"); - else if (def->data.vnc.websocket) - virBufferAsprintf(&attrBuf, " websocket=3D'%d'", def->data= .vnc.websocket); - - if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS) - virBufferAsprintf(&attrBuf, " websocketGenerated=3D'%s'", - def->data.vnc.websocketGenerated ? "yes"= : "no"); - - virDomainGraphicsListenDefFormatAddr(&attrBuf, glisten, flags); - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } - - virBufferEscapeString(&attrBuf, " keymap=3D'%s'", - def->data.vnc.keymap); - - if (def->data.vnc.sharePolicy) - virBufferAsprintf(&attrBuf, " sharePolicy=3D'%s'", - virDomainGraphicsVNCSharePolicyTypeToString( - def->data.vnc.sharePolicy)); - - if (def->data.vnc.powerControl) - virBufferAsprintf(&attrBuf, " powerControl=3D'%s'", - virTristateBoolTypeToString(def->data.vnc.po= werControl)); - - virDomainGraphicsAuthDefFormatAttr(&attrBuf, &def->data.vnc.auth, = flags); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_SDL: --=20 2.48.1