From nobody Wed May 8 20:55:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1613476568748478.34890965144166; Tue, 16 Feb 2021 03:56:08 -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-338-pzyfH7f8NM6_oxMIxDjU6A-1; Tue, 16 Feb 2021 06:56:04 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05718189DF50; Tue, 16 Feb 2021 11:55:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 70B0A19D6C; Tue, 16 Feb 2021 11:55:58 +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 BE49E18095CB; Tue, 16 Feb 2021 11:55:55 +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 11GBttSc029198 for ; Tue, 16 Feb 2021 06:55:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 169B910023AD; Tue, 16 Feb 2021 11:55:55 +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 27F331002382; Tue, 16 Feb 2021 11:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613476567; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bNqL31VARCn3eDZFhReyQoDGbLUjYqg/ZoHeJAFt6QM=; b=HGvMD2HTzUc59sDB255iecADt5lhw71N05c65ZDpJY1+cHHunFfuqjpv0Bn61NmqYGJqju 6W8u2nMJ4n1AMJ72sZCJg8r8r3Zmehjj5xqPnaanqMuNWwF/HkfIc4bRFN7nV/JhoMIo2z 5yp/flDWAgr5nvq/kmFZBNfrcC278tk= X-MC-Unique: pzyfH7f8NM6_oxMIxDjU6A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH] qemu: use long on|off syntax for -spice boolean option values Date: Tue, 16 Feb 2021 11:55:49 +0000 Message-Id: <20210216115549.151883-1-berrange@redhat.com> 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.84 on 10.5.11.23 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 -spice since at least 1.5.3, so we don't need to check for it. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 8 ++++---- .../qemuxml2argvdata/graphics-spice-agent-file-xfer.args | 2 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 +- tests/qemuxml2argvdata/graphics-spice-usb-redir.args | 2 +- tests/qemuxml2argvdata/graphics-spice.args | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1d2fc4495b..62fae6fe81 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7779,7 +7779,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, } =20 if (cfg->spiceSASL) { - virBufferAddLit(&opt, "sasl,"); + virBufferAddLit(&opt, "sasl=3Don,"); =20 if (cfg->spiceSASLdir) virCommandAddEnvPair(cmd, "SASL_CONF_PATH", @@ -7811,7 +7811,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, * in this bit of the code */ if (!graphics->data.spice.auth.passwd && !cfg->spicePassword) - virBufferAddLit(&opt, "disable-ticketing,"); + virBufferAddLit(&opt, "disable-ticketing=3Don,"); =20 if (hasSecure) { virBufferAddLit(&opt, "x509-dir=3D"); @@ -7893,10 +7893,10 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConf= igPtr cfg, virBufferAsprintf(&opt, "streaming-video=3D%s,", virDomainGraphicsSpiceStreamingModeTypeToString(= graphics->data.spice.streaming)); if (graphics->data.spice.copypaste =3D=3D VIR_TRISTATE_BOOL_NO) - virBufferAddLit(&opt, "disable-copy-paste,"); + virBufferAddLit(&opt, "disable-copy-paste=3Don,"); =20 if (graphics->data.spice.filetransfer =3D=3D VIR_TRISTATE_BOOL_NO) - virBufferAddLit(&opt, "disable-agent-file-xfer,"); + virBufferAddLit(&opt, "disable-agent-file-xfer=3Don,"); =20 if (graphics->data.spice.gl =3D=3D VIR_TRISTATE_BOOL_YES) { /* spice.gl is a TristateBool, but qemu expects on/off: use diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/t= ests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args index 5aa7da2d4a..08c3173e6a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args @@ -27,7 +27,7 @@ server=3Don,wait=3Doff \ -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 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,\ -tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-file-xfer,\ +tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-file-xfer=3Don= ,\ seamless-migration=3Don \ -vga qxl \ -global qxl-vga.ram_size=3D67108864 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxm= l2argvdata/graphics-spice-sasl.args index d71c527a09..024b775afd 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args @@ -27,7 +27,7 @@ server=3Don,wait=3Doff \ -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 \ --spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl,\ +-spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl=3Don,\ x509-dir=3D/etc/pki/libvirt-spice,tls-channel=3Ddefault,seamless-migration= =3Don \ -vga qxl \ -global qxl-vga.ram_size=3D67108864 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/q= emuxml2argvdata/graphics-spice-usb-redir.args index ba6e6abee7..780e189a95 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args @@ -32,7 +32,7 @@ addr=3D0x4 \ tls-channel=3Dmain,plaintext-channel=3Dinputs,tls-channel=3Dusbredir,\ image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,\ zlib-glz-wan-compression=3Dauto,playback-compression=3Don,streaming-video= =3Dfilter,\ -disable-copy-paste,seamless-migration=3Don \ +disable-copy-paste=3Don,seamless-migration=3Don \ -vga cirrus \ -chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D4000 \ -device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2arg= vdata/graphics-spice.args index 34f3a7dd33..e2a8593c8e 100644 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ b/tests/qemuxml2argvdata/graphics-spice.args @@ -30,7 +30,7 @@ server=3Don,wait=3Doff \ tls-channel=3Ddefault,tls-channel=3Dmain,plaintext-channel=3Dinputs,\ image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,\ zlib-glz-wan-compression=3Dauto,playback-compression=3Don,streaming-video= =3Dfilter,\ -disable-copy-paste,disable-agent-file-xfer,seamless-migration=3Don \ +disable-copy-paste=3Don,disable-agent-file-xfer=3Don,seamless-migration=3D= on \ -vga qxl \ -global qxl-vga.ram_size=3D67108864 \ -global qxl-vga.vram_size=3D33554432 \ --=20 2.29.2