From nobody Mon Feb 9 19:54:06 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=1632411523; cv=none; d=zohomail.com; s=zohoarc; b=BJmeDFmVgGjBNCf4jVCXe0KHLfvlzt+m6pYHdVEmXpW/mpYVGEUlsAYhnM8p2XIhq/bFJWm/mqwI+QklswFJookqfRiLAxDUHkiOFtAwiCpFC/UakS6zZ8LJ5QHbk7ErVQdQT4AuQaP6crbyiuaE6YpPUFRYo7C/WLY8h68uhlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632411523; 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=1Zsr/W5EfC8WJKtQLP19B3Cvruw6GOlLMBtHc+xGTNY=; b=cf8jbbYOJV0q8HQcpC14t15M4otcYxUF0OVEGqdwwDQ5FogXwjmYJsRDQfEkBVGRuQaLoje9XuIQEk6f2xO2FyBrbWbjHQg8isuEuaGXrMmJt5Tz6/cLisrAGezUGl42SSKH6TnDf3TR0rD4UfYfddEvTrTIT3mHBJZlCFgkLVE= 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) 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 1632411523164275.3298085751426; Thu, 23 Sep 2021 08:38:43 -0700 (PDT) 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-459-NHd67bX5Pu2qNUrRBelTlg-1; Thu, 23 Sep 2021 11:38:40 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E6B3100C67F; Thu, 23 Sep 2021 15:38:34 +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 9369976613; Thu, 23 Sep 2021 15:38:33 +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 15B7B4EA2F; Thu, 23 Sep 2021 15:38:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18NFcVgc000882 for ; Thu, 23 Sep 2021 11:38:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D31F100EBB8; Thu, 23 Sep 2021 15:38:31 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AB32102482F for ; Thu, 23 Sep 2021 15:37:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632411522; 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=1Zsr/W5EfC8WJKtQLP19B3Cvruw6GOlLMBtHc+xGTNY=; b=BAw8sAZE/mOWTt1XaSlIHpKtqjrv9rEQ9zYG7B5e6I7v3ugMAkfgrPEUvMcwPeAb7/2J8C S4W0hGfgQaP2PWVEO9qrcObI2ahP0WvXuXEhR95G6x17AUxiCPwyHa41lY2kWMaRE/FaW7 70Khy35apvEtrIKGgCDRA5TLvT0tBTw= X-MC-Unique: NHd67bX5Pu2qNUrRBelTlg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/14] qemu: command: Always assume QEMU_CAPS_VNC_OPTS Date: Thu, 23 Sep 2021 17:37:12 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632411524574100001 Content-Type: text/plain; charset="utf-8" The switch to QemuOpts parser which brought the long-form options happened in qemu commit 4db14629c3 ("vnc: switch to QemuOpts, allow multiple servers") released in v2.3.0. We can always assume this capability and remove the old-style generators. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 10 ++-------- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 08c88b12f4..8a3724ad45 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7955,10 +7955,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig = *cfg, } if (graphics->data.vnc.auth.passwd || cfg->vncPassword) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) - virBufferAddLit(&opt, ",password=3Don"); - else - virBufferAddLit(&opt, ",password"); + virBufferAddLit(&opt, ",password=3Don"); } if (cfg->vncTLS) { @@ -7986,10 +7983,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig = *cfg, } if (cfg->vncSASL) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS)) - virBufferAddLit(&opt, ",sasl=3Don"); - else - virBufferAddLit(&opt, ",sasl"); + virBufferAddLit(&opt, ",sasl=3Don"); if (cfg->vncSASLdir) virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2= argvdata/graphics-vnc-sasl.args index fd1ce48ab5..f5c4b7dfa9 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args @@ -28,6 +28,6 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --vnc 127.0.0.1:3,sasl \ +-vnc 127.0.0.1:3,sasl=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don --=20 2.31.1