From nobody Wed Nov 19 00:12:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613503559227784.2973494767472; Tue, 16 Feb 2021 11:25:59 -0800 (PST) Received: from localhost ([::1]:35888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5yw-00068f-1e for importer@patchew.org; Tue, 16 Feb 2021 14:25:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kN-0002oo-Tw for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kJ-0004QN-Oo for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:55 -0500 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-237-2XaAmEcENxaZLW96bQ5QBQ-1; Tue, 16 Feb 2021 14:10:48 -0500 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 6EA4E801965; Tue, 16 Feb 2021 19:10:47 +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 30A465C1B4; Tue, 16 Feb 2021 19:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502650; 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=Y3PIZaHbZpFZMzcZkuR+BZJs5rBNI+lgmhFIGQKRghU=; b=GSvnxw+5gmZI7c0ZQGa/zLcu9vbWKlw3nF5iSdIIBDLOrp9oYUqIIl0/VM15hdrUN2NAVC AdmR8AZo4LOdgKHtL1wIuEA3ddO8oznVImVodk2Za6AugIjZIaDzBTR6pA3DGorZXOvmEj MRNpv5CD9QYK4yPZ+cdUaUy6qnKjCiE= X-MC-Unique: 2XaAmEcENxaZLW96bQ5QBQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 07/10] docs: update to show preferred boolean syntax for -chardev Date: Tue, 16 Feb 2021 19:10:24 +0000 Message-Id: <20210216191027.595031-8-berrange@redhat.com> In-Reply-To: <20210216191027.595031-1-berrange@redhat.com> References: <20210216191027.595031-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The preferred syntax is to use "foo=3Don|off", rather than a bare "foo" or "nofoo". Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/COLO-FT.txt | 8 ++++---- docs/ccid.txt | 6 ++++-- docs/colo-proxy.txt | 16 ++++++++-------- docs/devel/writing-qmp-commands.txt | 2 +- docs/interop/live-block-operations.rst | 4 ++-- docs/interop/qmp-intro.txt | 4 ++-- docs/system/cpu-hotplug.rst | 2 +- docs/system/s390x/3270.rst | 2 +- docs/system/target-avr.rst | 2 +- docs/tools/qemu-storage-daemon.rst | 4 ++-- scripts/qmp/qemu-ga-client | 2 +- tests/test-char.c | 4 ++-- 12 files changed, 29 insertions(+), 27 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index bc5fb2a1bb..8874690e83 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -162,11 +162,11 @@ instance. -device piix3-usb-uhci -device usb-tablet -name primary \ -netdev tap,id=3Dhn0,vhost=3Doff,helper=3D/usr/lib/qemu/qemu-bridge-hel= per \ -device rtl8139,id=3De0,netdev=3Dhn0 \ - -chardev socket,id=3Dmirror0,host=3D0.0.0.0,port=3D9003,server,nowait \ - -chardev socket,id=3Dcompare1,host=3D0.0.0.0,port=3D9004,server,wait \ - -chardev socket,id=3Dcompare0,host=3D127.0.0.1,port=3D9001,server,nowai= t \ + -chardev socket,id=3Dmirror0,host=3D0.0.0.0,port=3D9003,server=3Don,wai= t=3Doff \ + -chardev socket,id=3Dcompare1,host=3D0.0.0.0,port=3D9004,server=3Don,wa= it=3Don \ + -chardev socket,id=3Dcompare0,host=3D127.0.0.1,port=3D9001,server=3Don,= wait=3Doff \ -chardev socket,id=3Dcompare0-0,host=3D127.0.0.1,port=3D9001 \ - -chardev socket,id=3Dcompare_out,host=3D127.0.0.1,port=3D9005,server,no= wait \ + -chardev socket,id=3Dcompare_out,host=3D127.0.0.1,port=3D9005,server=3D= on,wait=3Doff \ -chardev socket,id=3Dcompare_out0,host=3D127.0.0.1,port=3D9005 \ -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0 \ -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx,indev=3D= compare_out \ diff --git a/docs/ccid.txt b/docs/ccid.txt index c7fda6d07d..c97fbd2de0 100644 --- a/docs/ccid.txt +++ b/docs/ccid.txt @@ -109,7 +109,8 @@ NSS. Registration can be done from Firefox or the comm= and line: =20 on the host specify the ccid-card-passthru device with a suitable chardev: =20 - qemu -chardev socket,server,host=3D0.0.0.0,port=3D2001,id=3Dccid,nowai= t -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid + qemu -chardev socket,server=3Don,host=3D0.0.0.0,port=3D2001,id=3Dccid,= wait=3Doff \ + -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid =20 on the client run vscclient, built when you built QEMU: =20 @@ -125,7 +126,8 @@ Follow instructions as per #4, except run QEMU and vscc= lient as follows: Run qemu as per #5, and run vscclient from the "fake-smartcard" directory as follows: =20 - qemu -chardev socket,server,host=3D0.0.0.0,port=3D2001,id=3Dccid,nowai= t -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid + qemu -chardev socket,server=3Don,host=3D0.0.0.0,port=3D2001,id=3Dccid,= wait=3Doff \ + -usb -device usb-ccid -device ccid-card-passthru,chardev=3Dccid vscclient -e "db=3D\"sql:$PWD\" use_hw=3Dno soft=3D(,Test,CAC,,id-cert= ,signing-cert,encryption-cert)" 2001 =20 =20 diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index fa1cef0278..1fc38aed1b 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -164,11 +164,11 @@ clearly describe the usage. Primary(ip:3.3.3.3): -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/etc= /qemu-ifdown -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 --chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait --chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait --chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait +-chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server=3Don,wait= =3Doff -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 --chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server,nowait +-chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server=3Don,wa= it=3Doff -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 -object iothread,id=3Diothread1 -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0 @@ -190,11 +190,11 @@ If you want to use virtio-net-pci or other driver wit= h vnet_header: Primary(ip:3.3.3.3): -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downscript=3D/etc= /qemu-ifdown -device e1000,id=3De0,netdev=3Dhn0,mac=3D52:a4:00:12:78:66 --chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server,nowait --chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server,nowait --chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server,nowait +-chardev socket,id=3Dmirror0,host=3D3.3.3.3,port=3D9003,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare1,host=3D3.3.3.3,port=3D9004,server=3Don,wait= =3Doff +-chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,server=3Don,wait= =3Doff -chardev socket,id=3Dcompare0-0,host=3D3.3.3.3,port=3D9001 --chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server,nowait +-chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,server=3Don,wa= it=3Doff -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev=3Dmirror0,vne= t_hdr_support -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx,indev=3Dcom= pare_out,vnet_hdr_support diff --git a/docs/devel/writing-qmp-commands.txt b/docs/devel/writing-qmp-c= ommands.txt index 258e63bff5..b1e31d56c0 100644 --- a/docs/devel/writing-qmp-commands.txt +++ b/docs/devel/writing-qmp-commands.txt @@ -39,7 +39,7 @@ shown here. First, QEMU should be started like this: =20 # qemu-system-TARGET [...] \ - -chardev socket,id=3Dqmp,port=3D4444,host=3Dlocalhost,server \ + -chardev socket,id=3Dqmp,port=3D4444,host=3Dlocalhost,server=3Don \ -mon chardev=3Dqmp,mode=3Dcontrol,pretty=3Don =20 Then, in a different terminal: diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-blo= ck-operations.rst index e13f5a21f8..1073b930dc 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -133,7 +133,7 @@ socket:: -M q35 -nodefaults -m 512 \ -blockdev node-name=3Dnode-A,driver=3Dqcow2,file.driver=3Dfile,fil= e.node-name=3Dfile,file.filename=3D./a.qcow2 \ -device virtio-blk,drive=3Dnode-A,id=3Dvirtio0 \ - -monitor stdio -qmp unix:/tmp/qmp-sock,server,nowait + -monitor stdio -qmp unix:/tmp/qmp-sock,server=3Don,wait=3Doff =20 The ``-blockdev`` command-line option, used above, is available from QEMU 2.9 onwards. In the above invocation, notice the ``node-name`` @@ -698,7 +698,7 @@ it could be located elsewhere):: -M q35 -nodefaults -m 512 \ -blockdev node-name=3Dnode-TargetDisk,driver=3Dqcow2,file.driver= =3Dfile,file.node-name=3Dfile,file.filename=3D./target-disk.qcow2 \ -device virtio-blk,drive=3Dnode-TargetDisk,id=3Dvirtio0 \ - -S -monitor stdio -qmp unix:./qmp-sock2,server,nowait \ + -S -monitor stdio -qmp unix:./qmp-sock2,server=3Don,wait=3Doff \ -incoming tcp:localhost:6666 =20 Given the disk image chain on source QEMU:: diff --git a/docs/interop/qmp-intro.txt b/docs/interop/qmp-intro.txt index 9d54a718b8..1c745a7af0 100644 --- a/docs/interop/qmp-intro.txt +++ b/docs/interop/qmp-intro.txt @@ -26,7 +26,7 @@ Usage You can use the -qmp option to enable QMP. For example, the following makes QMP available on localhost port 4444: =20 -$ qemu [...] -qmp tcp:localhost:4444,server,nowait +$ qemu [...] -qmp tcp:localhost:4444,server=3Don,wait=3Doff =20 However, for more flexibility and to make use of more options, the -mon command-line option should be used. For instance, the following example @@ -34,7 +34,7 @@ creates one HMP instance (human monitor) on stdio and one= QMP instance on localhost port 4444: =20 $ qemu [...] -chardev stdio,id=3Dmon0 -mon chardev=3Dmon0,mode=3Dreadline \ - -chardev socket,id=3Dmon1,host=3Dlocalhost,port=3D4444,server= ,nowait \ + -chardev socket,id=3Dmon1,host=3Dlocalhost,port=3D4444,server= =3Don,wait=3Doff \ -mon chardev=3Dmon1,mode=3Dcontrol,pretty=3Don =20 Please, refer to QEMU's manpage for more information. diff --git a/docs/system/cpu-hotplug.rst b/docs/system/cpu-hotplug.rst index d0b06403f1..bd0663616e 100644 --- a/docs/system/cpu-hotplug.rst +++ b/docs/system/cpu-hotplug.rst @@ -14,7 +14,7 @@ vCPU hotplug $ qemu-system-x86_64 -display none -no-user-config -m 2048 \ -nodefaults -monitor stdio -machine pc,accel=3Dkvm,usb=3Doff \ -smp 1,maxcpus=3D2 -cpu IvyBridge-IBRS \ - -qmp unix:/tmp/qmp-sock,server,nowait + -qmp unix:/tmp/qmp-sock,server=3Don,wait=3Doff =20 (2) Run 'qmp-shell' (located in the source tree, under: "scripts/qmp/) to connect to the just-launched QEMU:: diff --git a/docs/system/s390x/3270.rst b/docs/system/s390x/3270.rst index 0554a70a9f..0e173b323f 100644 --- a/docs/system/s390x/3270.rst +++ b/docs/system/s390x/3270.rst @@ -24,7 +24,7 @@ Example configuration =20 * Add a ``tn3270`` chardev and a ``x-terminal3270`` to the QEMU command li= ne:: =20 - -chardev socket,id=3Dch0,host=3D0.0.0.0,port=3D2300,nowait,server,tn3270 + -chardev socket,id=3Dch0,host=3D0.0.0.0,port=3D2300,wait=3Doff,server= =3Don,tn3270=3Don -device x-terminal3270,chardev=3Dch0,devno=3Dfe.0.000a,id=3Dterminal0 =20 * Start the guest. In the guest, use ``chccwdev -e 0.0.000a`` to enable diff --git a/docs/system/target-avr.rst b/docs/system/target-avr.rst index 25ab46ef05..03d5ab51c1 100644 --- a/docs/system/target-avr.rst +++ b/docs/system/target-avr.rst @@ -24,7 +24,7 @@ AVR cpu - Continuous non interrupted execution with serial output into telnet wind= ow:: =20 qemu-system-avr -M mega2560 -bios demo.elf -nographic \ - -serial tcp::5678,server,nowait + -serial tcp::5678,server=3Don,wait=3Doff =20 and then in another shell:: =20 diff --git a/docs/tools/qemu-storage-daemon.rst b/docs/tools/qemu-storage-d= aemon.rst index f63627eaf6..c05b3d3811 100644 --- a/docs/tools/qemu-storage-daemon.rst +++ b/docs/tools/qemu-storage-daemon.rst @@ -69,7 +69,7 @@ Standard options: a description of character device properties. A common character device definition configures a UNIX domain socket:: =20 - --chardev socket,id=3Dchar1,path=3D/tmp/qmp.sock,server,nowait + --chardev socket,id=3Dchar1,path=3D/tmp/qmp.sock,server=3Don,wait=3Doff =20 .. option:: --export [type=3D]nbd,id=3D,node-name=3D[,name= =3D][,writable=3Don|off][,bitmap=3D] --export [type=3D]vhost-user-blk,id=3D,node-name=3D,addr.= type=3Dunix,addr.path=3D[,writable=3Don|off][,logical-block-si= ze=3D][,num-queues=3D] @@ -124,7 +124,7 @@ Launch the daemon with QMP monitor socket ``qmp.sock`` = so clients can execute QMP commands:: =20 $ qemu-storage-daemon \ - --chardev socket,path=3Dqmp.sock,server,nowait,id=3Dchar1 \ + --chardev socket,path=3Dqmp.sock,server=3Don,wait=3Doff,id=3Dchar1 \ --monitor chardev=3Dchar1 =20 Export raw image file ``disk.img`` over NBD UNIX domain socket ``nbd.sock`= `:: diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client index ce122984a9..348d85864c 100755 --- a/scripts/qmp/qemu-ga-client +++ b/scripts/qmp/qemu-ga-client @@ -11,7 +11,7 @@ # # Start QEMU with: # -# # qemu [...] -chardev socket,path=3D/tmp/qga.sock,server,nowait,id=3Dqga= 0 \ +# # qemu [...] -chardev socket,path=3D/tmp/qga.sock,server=3Don,wait=3Doff= ,id=3Dqga0 \ # -device virtio-serial -device virtserialport,chardev=3Dqga0,name=3Dorg= .qemu.guest_agent.0 # # Run the script: diff --git a/tests/test-char.c b/tests/test-char.c index 469d25989c..755d54c15e 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -780,7 +780,7 @@ static void char_socket_server_test(gconstpointer opaqu= e) =20 g_setenv("QTEST_SILENT_ERRORS", "1", 1); /* - * We rely on config->addr containing "nowait", otherwise + * We rely on config->addr containing "wait=3Doff", otherwise * qemu_chr_new() will block until a client connects. We * can't spawn our client thread though, because until * qemu_chr_new() returns we don't know what TCP port was @@ -1114,7 +1114,7 @@ static void char_socket_server_two_clients_test(gcons= tpointer opaque) =20 g_setenv("QTEST_SILENT_ERRORS", "1", 1); /* - * We rely on addr containing "nowait", otherwise + * We rely on addr containing "wait=3Doff", otherwise * qemu_chr_new() will block until a client connects. We * can't spawn our client thread though, because until * qemu_chr_new() returns we don't know what TCP port was --=20 2.29.2