From nobody Tue Dec 16 08:34:10 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1749040448; cv=none; d=zohomail.com; s=zohoarc; b=mUXFuPwPLRPxDIpMNlXSTVQqdfbZBPXS90WpBqK/IkcAZ4Fr+/AXRMDFfK39djheV2/BxmbUs8FKTZJZeOAwimV4uNCsHWRZpGc+FmDYqaqeXQS0jHh2378uYQsh2AhcunYZof1xwN4NtxLOBV9wUULy8me3VV6u+nEb40U0fJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749040448; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=aMep6ySYvL5BaBZ1EAX9mSFuJBs9JImRdgcuh8C7K3c=; b=fOG1/dxan+AZuA3IPRJyh3PbKyDKA0JgTXjzgZqu1VAT2+Sy47VGk/detbLUMrBXCqNJ5sa5SL7bzGXsYeXyUKbKXO7ldnMFzQ7euA/a9N9FEqW31sOceHMXWa+z9Prnuv7lW8/AsaB9Se/XXgB1y1kdEQCG7uupKN9BQ2eKkE4= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1749040448658884.2710951866696; Wed, 4 Jun 2025 05:34:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 996F512D1; Wed, 4 Jun 2025 08:34:07 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3354A121F; Wed, 4 Jun 2025 08:32:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4951C14B0; Wed, 4 Jun 2025 08:32:33 -0400 (EDT) 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 780B51248 for ; Wed, 4 Jun 2025 08:32:27 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-3JzutEdTPG6MFkd14Oo5JA-1; Wed, 04 Jun 2025 08:32:25 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D27F9180035C for ; Wed, 4 Jun 2025 12:32:24 +0000 (UTC) Received: from kshcheti-thinkpadp1gen4i.tpbc.com (unknown [10.43.2.246]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E2B9319560AD; Wed, 4 Jun 2025 12:32:23 +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, 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=1749040347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UObnp/ReCYBTFly+u/GHibYFTBw+dXEDr6BJZ85dpjo=; b=Yuag8E50z+LV42KsxKlew7lxhgvtpHuGu83ohOgW8iFU4JO5QWCk5kC6T5B0Doyl3zL0b4 1NhcQGDHsTmDyWl6nY+nATcRqvYeQbIny80BguRax89+yhbrRtipFp2nqkdMNWeOMF76Ql V57InCOQD+QlrDiXiN1F9P5F3HKVJqw= X-MC-Unique: 3JzutEdTPG6MFkd14Oo5JA-1 X-Mimecast-MFC-AGG-ID: 3JzutEdTPG6MFkd14Oo5JA_1749040344 To: devel@lists.libvirt.org Subject: [PATCH v2 3/4] conf: RDP graphics parse refactor Date: Wed, 4 Jun 2025 14:24:14 +0200 Message-ID: <20250604123215.34281-4-kshcheti@redhat.com> In-Reply-To: <20250604123215.34281-1-kshcheti@redhat.com> References: <20250604123215.34281-1-kshcheti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VO9Pa9-wr0OVRkQCiP34D98lyTflAeg3thqtEe00zec_1749040344 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WUGE4ED2QQBLHOIG3UDOKWHVNHDBE4BH X-Message-ID-Hash: WUGE4ED2QQBLHOIG3UDOKWHVNHDBE4BH X-MailFrom: kshcheti@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 CC: Kirill Shchetiniuk 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: From: Kirill Shchetiniuk via Devel Reply-To: Kirill Shchetiniuk X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749040450457116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Previously, the RDP graphics definition parsing were implemented by string parsing, the virDomainGraphicsDefParseXMLRDP function is refactored to use the appropriate virXMLProp* utility functions. Overall parsing logic was not changed and results the same output as before. Moreover, 'replaceUser' and 'mutliUser' params type was changed from bool to tristate type, to avoid unnecessary type convertions. Signed-off-by: Kirill Shchetiniuk --- src/conf/domain_conf.c | 51 +++++++++++++++++++++------------------- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_validate.c | 4 ++-- src/vbox/vbox_common.c | 8 +++---- 5 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 32a358d72c..201a4ded8b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11917,40 +11917,41 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphics= Def *def, xmlXPathContextPtr ctxt, unsigned int flags) { - g_autofree char *port =3D virXMLPropString(node, "port"); - g_autofree char *autoport =3D virXMLPropString(node, "autoport"); - g_autofree char *replaceUser =3D virXMLPropString(node, "replaceUser"); - g_autofree char *multiUser =3D virXMLPropString(node, "multiUser"); + virTristateBool autoport; =20 if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) return -1; =20 - if (port) { - if (virStrToLong_i(port, NULL, 10, &def->data.rdp.port) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse rdp port %1$s"), port); - return -1; - } - /* Legacy compat syntax, used -1 for auto-port */ - if (def->data.rdp.port =3D=3D -1) - def->data.rdp.autoport =3D true; + if (virXMLPropInt(node, "port", 10, VIR_XML_PROP_NONE, + &def->data.rdp.port, 0) < 0) + return -1; =20 - } else { - def->data.rdp.port =3D 0; + if (def->data.rdp.port =3D=3D -1) { + /* Legacy compat syntax, used -1 for auto-port */ def->data.rdp.autoport =3D true; } =20 - if (STREQ_NULLABLE(autoport, "yes")) + if (def->data.rdp.port =3D=3D 0) { + /* No port specified */ def->data.rdp.autoport =3D true; + } + + if (virXMLPropTristateBool(node, "autoport", VIR_XML_PROP_NONE, + &autoport) < 0) + return -1; + + virTristateBoolToBool(autoport, &def->data.rdp.autoport); =20 if (def->data.rdp.autoport && (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) def->data.rdp.port =3D 0; =20 - if (STREQ_NULLABLE(replaceUser, "yes")) - def->data.rdp.replaceUser =3D true; + if (virXMLPropTristateBool(node, "replaceUser", VIR_XML_PROP_NONE, + &def->data.rdp.replaceUser)) + return -1; =20 - if (STREQ_NULLABLE(multiUser, "yes")) - def->data.rdp.multiUser =3D true; + if (virXMLPropTristateBool(node, "multiUser", VIR_XML_PROP_NONE, + &def->data.rdp.replaceUser)) + return -1; =20 if (virDomainGraphicsAuthDefParseXML(node, &def->data.rdp.auth, def->type) < 0) @@ -26977,11 +26978,13 @@ virDomainGraphicsDefFormatRDP(virBuffer *attrBuf, if (def->data.rdp.autoport) virBufferAddLit(attrBuf, " autoport=3D'yes'"); =20 - if (def->data.rdp.replaceUser) - virBufferAddLit(attrBuf, " replaceUser=3D'yes'"); + if (def->data.rdp.replaceUser !=3D VIR_TRISTATE_BOOL_ABSENT) + virBufferAsprintf(attrBuf, " replaceUser=3D'%s'", + virTristateBoolTypeToString(def->data.rdp.replac= eUser)); =20 - if (def->data.rdp.multiUser) - virBufferAddLit(attrBuf, " multiUser=3D'yes'"); + if (def->data.rdp.multiUser !=3D VIR_TRISTATE_BOOL_ABSENT) + virBufferAsprintf(attrBuf, " multiUser=3D'%s'", + virTristateBoolTypeToString(def->data.rdp.multiU= ser)); =20 virDomainGraphicsListenDefFormatAddr(attrBuf, glisten, flags); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8df404dc42..c909cfba3f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2043,8 +2043,8 @@ struct _virDomainGraphicsDef { int port; bool portReserved; bool autoport; - bool replaceUser; - bool multiUser; + virTristateBool replaceUser; + virTristateBool multiUser; virDomainGraphicsAuthDef auth; } rdp; struct { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 54b84922d6..02cca5fb6b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5550,12 +5550,12 @@ qemuProcessStartValidateGraphics(virDomainObj *vm) _("qemu-rdp does not support multiple liste= ns for one graphics device.")); return -1; } - if (graphics->data.rdp.multiUser) { + if (graphics->data.rdp.multiUser =3D=3D VIR_TRISTATE_BOOL_YES)= { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("qemu-rdp doesn't support the 'multiUser'= attribute.")); return -1; } - if (graphics->data.rdp.replaceUser) { + if (graphics->data.rdp.replaceUser =3D=3D VIR_TRISTATE_BOOL_YE= S) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("qemu-rdp doesn't support the 'replaceUse= r' attribute.")); return -1; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index e45f636418..968533ccf3 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4512,12 +4512,12 @@ qemuValidateDomainDeviceDefDBusGraphics(const virDo= mainGraphicsDef *graphics, static int qemuValidateDomainDeviceDefRDPGraphics(const virDomainGraphicsDef *graphic= s) { - if (graphics->data.rdp.replaceUser) { + if (graphics->data.rdp.replaceUser =3D=3D VIR_TRISTATE_BOOL_YES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("RDP doesn't support 'replaceUser'")); return -1; } - if (graphics->data.rdp.multiUser) { + if (graphics->data.rdp.multiUser =3D=3D VIR_TRISTATE_BOOL_YES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("RDP doesn't support 'multiUser'")); return -1; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 349ac832dc..929d452abd 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1703,13 +1703,13 @@ vboxAttachDisplay(virDomainDef *def, struct _vboxDr= iver *data, IMachine *machine =20 gVBoxAPI.UIVRDEServer.SetPorts(data, VRDEServer, def->grap= hics[i]); =20 - if (def->graphics[i]->data.rdp.replaceUser) { + if (def->graphics[i]->data.rdp.replaceUser =3D=3D VIR_TRIS= TATE_BOOL_YES) { gVBoxAPI.UIVRDEServer.SetReuseSingleConnection(VRDESer= ver, PR_TRUE= ); VIR_DEBUG("VRDP set to reuse single connection"); } =20 - if (def->graphics[i]->data.rdp.multiUser) { + if (def->graphics[i]->data.rdp.multiUser =3D=3D VIR_TRISTA= TE_BOOL_YES) { gVBoxAPI.UIVRDEServer.SetAllowMultiConnection(VRDEServ= er, PR_TRUE); VIR_DEBUG("VRDP set to allow multiple connection"); @@ -3611,11 +3611,11 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriv= er *data, IMachine *machine) =20 gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMu= ltiConnection); if (allowMultiConnection) - graphics->data.rdp.multiUser =3D true; + graphics->data.rdp.multiUser =3D VIR_TRISTATE_BOOL_YES; =20 gVBoxAPI.UIVRDEServer.GetReuseSingleConnection(VRDEServer, &reuseS= ingleConnection); if (reuseSingleConnection) - graphics->data.rdp.replaceUser =3D true; + graphics->data.rdp.replaceUser =3D VIR_TRISTATE_BOOL_YES; =20 VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics); } --=20 2.49.0