From nobody Sun Feb 8 16:30:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613480262; cv=none; d=zohomail.com; s=zohoarc; b=BSjrxk3cQXFzPwMjw6wfMMYSmyJzEuDK9UoCXc1AGaE4vbXtgyIf+QTtMKVHy5xYFgGrm1p4FZmjMx4ZdwlJWZJansXppzZ41tGPqdTeBvCVGnz7rU70l3OZg2KgpDYMOz/DOBwhCIEauWGD+b+vnehVWUj7938qmk98ZX862lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613480262; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G+rEaEYSF/2RPGw+FdesFJEwMMiciqtTn+i7hK+92d0=; b=Nr/m4+cvh8uRzpL0S3hxHsK6YBrD80WPKfLwkh9SRIzKIvRgNHvOhfGLFoX7oNs0+BVj3wNFMvTAkXmA98gay666SxZTKg5OVPiUdAVkxm5Hgd+JM2UFDvKMqIKY5pMnF0F/x6dy4MFA//fivrSCAGpl/bMSY+zEaxS1WZUJJUs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1613480261769207.75969307558432; Tue, 16 Feb 2021 04:57:41 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-02b3Q02SOmak4zvHHgPuhg-1; Tue, 16 Feb 2021 07:57:38 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F8B579EC2; Tue, 16 Feb 2021 12:57:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 395B86F45E; Tue, 16 Feb 2021 12:57:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E982557DFC; Tue, 16 Feb 2021 12:57:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11GCvE8X002235 for ; Tue, 16 Feb 2021 07:57:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id C8F2C60C6D; Tue, 16 Feb 2021 12:57:14 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id F02C560C15; Tue, 16 Feb 2021 12:57:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613480260; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=G+rEaEYSF/2RPGw+FdesFJEwMMiciqtTn+i7hK+92d0=; b=BxdRoAYwtOlIF1PK6PG6cwcLq68CFI3O9CjQvKjN31RDhYZ8w/OLP99gACxNwcKgTfcqop nYmovPw99LwArG/Dj46+FI1/wqHRe6DGumLwnXriYkE2O+1j48UPjKryX3iufgeIzGtv3C KkBJMGsTE2AfaZnUt3HYIZqRlnKTVk0= X-MC-Unique: 02b3Q02SOmak4zvHHgPuhg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/5] qemu: use on|off for -vnc boolean option values Date: Tue, 16 Feb 2021 12:57:02 +0000 Message-Id: <20210216125705.275788-3-berrange@redhat.com> In-Reply-To: <20210216125705.275788-1-berrange@redhat.com> References: <20210216125705.275788-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The preferred syntax for boolean options is to set the value "on" or "off". QEMU 7.1.0 will deprecate the short format we currently use. The long format has been supported with -vnc since the change to use QemuOpts in 2.2.0, so we check based on the new capability flag. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 18 ++++++++++++++---- .../graphics-vnc-tls-secret.x86_64-latest.args | 2 +- .../graphics-vnc-tls.x86_64-2.4.0.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a8342ff7d5..d801018aa2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7644,8 +7644,12 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigP= tr cfg, graphics->data.vnc.sharePolicy)); } =20 - if (graphics->data.vnc.auth.passwd || cfg->vncPassword) - virBufferAddLit(&opt, ",password"); + if (graphics->data.vnc.auth.passwd || cfg->vncPassword) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) + virBufferAddLit(&opt, ",password=3Don"); + else + virBufferAddLit(&opt, ",password"); + } =20 if (cfg->vncTLS) { qemuDomainGraphicsPrivatePtr gfxPriv =3D QEMU_DOMAIN_GRAPHICS_PRIV= ATE(graphics); @@ -7670,7 +7674,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigP= tr cfg, =20 virBufferAsprintf(&opt, ",tls-creds=3D%s", gfxPriv->tlsAlias); } else { - virBufferAddLit(&opt, ",tls"); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) + virBufferAddLit(&opt, ",tls=3Don"); + else + virBufferAddLit(&opt, ",tls"); if (cfg->vncTLSx509verify) { virBufferAddLit(&opt, ",x509verify=3D"); virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir= ); @@ -7682,7 +7689,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigP= tr cfg, } =20 if (cfg->vncSASL) { - virBufferAddLit(&opt, ",sasl"); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) + virBufferAddLit(&opt, ",sasl=3Don"); + else + virBufferAddLit(&opt, ",sasl"); =20 if (cfg->vncSASLdir) virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index 00119fcd3d..eb0df17eda 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -34,7 +34,7 @@ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8w= BYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ endpoint=3Dserver,verify-peer=3Dyes,passwordid=3Dvnc-tls-creds0-secret0 \ --vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl \ +-vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/te= sts/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args index 471ff0dc77..78a47f1d30 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args @@ -26,6 +26,6 @@ server=3Don,wait=3Doff \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --vnc 127.0.0.1:3,tls,x509verify=3D/etc/pki/libvirt-vnc,sasl \ +-vnc 127.0.0.1:3,tls=3Don,x509verify=3D/etc/pki/libvirt-vnc,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index b739a9b9c8..1c4b948b97 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,\ endpoint=3Dserver,verify-peer=3Dyes \ --vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl \ +-vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ --=20 2.29.2