From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613502827; cv=none; d=zohomail.com; s=zohoarc; b=eG0EB+cI4JuF7Ve/55Obor2lBEfANVqb4fgNEaSqidS4Jo52+TxYRE72nOywfWykKUBp6JsLxvSWnnzgxsydroN1dAiszMaR6vIBlZzp/GVu6nXymqs9GxbsZxg2OiMh9m2FvioIpAA8DCtwnn2zil/mfjr8dv/SAMBiGKhWUI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613502827; h=Content-Type:Content-Transfer-Encoding:Cc: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=1m+2Ou96HUgWTCnpAvrltd2hHhfoF2rLkJZPztbywig=; b=dnc8gOqjNXgDNaFNwBoxW+TA+VIZVHx84R2toRHgmfpqiK7GwikprpLNY1bgnOFHXB+iDQ5+EDQRnZujbaTZ7IcZIfOShOytwlSJ1SVV3FmafQ8faLEzg3bcZwnGq482r3/yqx6P7DE0vtst2cjVztkwk0w79aCp9h5mj4SIDsA= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613502826979398.747787775079; Tue, 16 Feb 2021 11:13:46 -0800 (PST) Received: from localhost ([::1]:40150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5n7-0004E2-RN for importer@patchew.org; Tue, 16 Feb 2021 14:13:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5k8-0002Wk-7w for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50332) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5k6-0004Ot-RA for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:40 -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-399-xDCtBY50OkayBfnE5HjRFA-1; Tue, 16 Feb 2021 14:10:36 -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 40D2B10082F6; Tue, 16 Feb 2021 19:10:35 +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 236425C1B4; Tue, 16 Feb 2021 19:10:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502638; 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=1m+2Ou96HUgWTCnpAvrltd2hHhfoF2rLkJZPztbywig=; b=UI74xqMJDRA0aaxiww/CjKM/Rkt+XroZzUQGIgzf/RiJBE39spS/yipJNKQZ1iOiV7hneq PZvUuqaV8bheSdSCK/1AllNEEE/8DxEi4vzbspO7oKPaFPwfpGwr8dnIjRyZguKmWCA0nD Y1f+5BYQpj2b2ZEidx+9dDc5RHBm1fM= X-MC-Unique: xDCtBY50OkayBfnE5HjRFA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 01/10] gdbstub: use preferred boolean option syntax Date: Tue, 16 Feb 2021 19:10:18 +0000 Message-Id: <20210216191027.595031-2-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) Signed-off-by: Daniel P. Berrang=C3=A9 --- gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdbstub.c b/gdbstub.c index 759bb00bcf..3ee40479b6 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -3505,7 +3505,7 @@ int gdbserver_start(const char *device) if (strstart(device, "tcp:", NULL)) { /* enforce required TCP attributes */ snprintf(gdbstub_device_name, sizeof(gdbstub_device_name), - "%s,nowait,nodelay,server", device); + "%s,wait=3Doff,delay=3Doff,server=3Don", device); device =3D gdbstub_device_name; } #ifndef _WIN32 --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613502834; cv=none; d=zohomail.com; s=zohoarc; b=Rarfo8nBlBRVkC27K6FU+jUQLPtIKjddanXSDZu7NM6RftyyFnu8VkwgkDYC1mMIFacSkVndRIpsmSg6zh4DF1qPQNdrPCRRBcJxV9wEEBus6+Zqn5FtPjx1t0M4L7DXqsWMlu7O5V2dfdQMTeLxDxRQJqew7TCgu24KDNoDdeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613502834; h=Content-Type:Content-Transfer-Encoding:Cc: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=7f3cF9FLPLfOmolQQ3RotNpTPiBGv5wPzbwCXGPIZOw=; b=AV8/7XV3wYLvNSigf5K1h87KIsj2ClsGKnYJPPdjMDfBbGHzfPbGOdG2rqXhDhZjnY15dWr7O4ZI+p/Edy2qGfsTBak5cT3NpB7qB5LVkXJG47TZL5/IHL72yGH6c4eZAtnEpsllnW/+OJ8FETIrQ9GC7tmetZRK+KehQviRy9s= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613502834154464.4824825486728; Tue, 16 Feb 2021 11:13:54 -0800 (PST) Received: from localhost ([::1]:40810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5nF-0004UE-3P for importer@patchew.org; Tue, 16 Feb 2021 14:13:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kE-0002fC-BI for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kB-0004PN-L5 for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:46 -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-388-rvVesU8NPb6xYR__JriovA-1; Tue, 16 Feb 2021 14:10:38 -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 1A4FCC287; Tue, 16 Feb 2021 19:10:37 +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 9DC485C1B4; Tue, 16 Feb 2021 19:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502642; 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=7f3cF9FLPLfOmolQQ3RotNpTPiBGv5wPzbwCXGPIZOw=; b=C/UPRc3wxYtcAYKN2HGlerv7VQDx9Janiui8IrVY7FMFA6cRUoLF59OLG8QWy/+5KtgRs5 Z9LxPqF5n2PDbcWDt5jrQFlQzzUb0D1weOOCLnuDU0A/EJRdzZds+RAaF+Z+KLKettWnqr a+kV+mX3iSZ7RoRAYALtfa5vTV+gWJE= X-MC-Unique: rvVesU8NPb6xYR__JriovA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 02/10] qemu-options: update to show preferred boolean syntax for -chardev Date: Tue, 16 Feb 2021 19:10:19 +0000 Message-Id: <20210216191027.595031-3-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=63.128.21.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_H4=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 --- qemu-options.hx | 78 ++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 6c34c7050f..972ef412cc 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3032,13 +3032,13 @@ DEFHEADING(Character device options:) DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, "-chardev help\n" "-chardev null,id=3Did[,mux=3Don|off][,logfile=3DPATH][,logappend=3Don= |off]\n" - "-chardev socket,id=3Did[,host=3Dhost],port=3Dport[,to=3Dto][,ipv4][,i= pv6][,nodelay][,reconnect=3Dseconds]\n" - " [,server][,nowait][,telnet][,websocket][,reconnect=3Dseconds= ][,mux=3Don|off]\n" + "-chardev socket,id=3Did[,host=3Dhost],port=3Dport[,to=3Dto][,ipv4=3Do= n|off][,ipv6=3Don|off][,delay=3Don|off][,reconnect=3Dseconds]\n" + " [,server=3Don|off][,wait=3Don|off][,telnet=3Don|off][,websoc= ket=3Don|off][,reconnect=3Dseconds][,mux=3Don|off]\n" " [,logfile=3DPATH][,logappend=3Don|off][,tls-creds=3DID][,tls= -authz=3DID] (tcp)\n" - "-chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet][,webso= cket][,reconnect=3Dseconds]\n" + "-chardev socket,id=3Did,path=3Dpath[,server=3Don|off][,wait=3Don|off]= [,telnet=3Don|off][,websocket=3Don|off][,reconnect=3Dseconds]\n" " [,mux=3Don|off][,logfile=3DPATH][,logappend=3Don|off][,abstr= act=3Don|off][,tight=3Don|off] (unix)\n" "-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr= ]\n" - " [,localport=3Dlocalport][,ipv4][,ipv6][,mux=3Don|off]\n" + " [,localport=3Dlocalport][,ipv4=3Don|off][,ipv6=3Don|off][,mu= x=3Don|off]\n" " [,logfile=3DPATH][,logappend=3Don|off]\n" "-chardev msmouse,id=3Did[,mux=3Don|off][,logfile=3DPATH][,logappend= =3Don|off]\n" "-chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols= ][,rows=3Drows]]\n" @@ -3148,21 +3148,21 @@ The available backends are: A void device. This device will not emit any data, and will drop any data it receives. The null backend does not take any options. =20 -``-chardev socket,id=3Did[,TCP options or unix options][,server][,nowait][= ,telnet][,websocket][,reconnect=3Dseconds][,tls-creds=3Did][,tls-authz=3Did= ]`` +``-chardev socket,id=3Did[,TCP options or unix options][,server=3Don|off][= ,wait=3Don|off][,telnet=3Don|off][,websocket=3Don|off][,reconnect=3Dseconds= ][,tls-creds=3Did][,tls-authz=3Did]`` Create a two-way stream socket, which can be either a TCP or a unix socket. A unix socket will be created if ``path`` is specified. Behaviour is undefined if TCP options are specified for a unix socket. =20 - ``server`` specifies that the socket shall be a listening socket. + ``server=3Don|off`` specifies that the socket shall be a listening soc= ket. =20 - ``nowait`` specifies that QEMU should not block waiting for a client + ``wait=3Don|off`` specifies that QEMU should not block waiting for a c= lient to connect to a listening socket. =20 - ``telnet`` specifies that traffic on the socket should interpret + ``telnet=3Don|off`` specifies that traffic on the socket should interp= ret telnet escape sequences. =20 - ``websocket`` specifies that the socket uses WebSocket protocol for + ``websocket=3Don|off`` specifies that the socket uses WebSocket protoc= ol for communication. =20 ``reconnect`` sets the timeout for reconnecting on non-server @@ -3183,7 +3183,7 @@ The available backends are: =20 TCP and unix socket options are given below: =20 - ``TCP options: port=3Dport[,host=3Dhost][,to=3Dto][,ipv4][,ipv6][,node= lay]`` + ``TCP options: port=3Dport[,host=3Dhost][,to=3Dto][,ipv4=3Don|off][,ip= v6=3Don|off][,delay=3Don|off]`` ``host`` for a listening socket specifies the local address to be bound. For a connecting socket species the remote host to connect to. ``host`` is optional for listening sockets. If not @@ -3199,21 +3199,21 @@ The available backends are: bind to subsequent ports up to and including ``to`` until it succeeds. ``to`` must be specified as a port number. =20 - ``ipv4`` and ``ipv6`` specify that either IPv4 or IPv6 must be - used. If neither is specified the socket may use either - protocol. + ``ipv4=3Don|off`` and ``ipv6=3Don|off`` specify that either IPv4 + or IPv6 must be used. If neither is specified the socket may + use either protocol. =20 - ``nodelay`` disables the Nagle algorithm. + ``delay=3Don|off`` disables the Nagle algorithm. =20 ``unix options: path=3Dpath[,abstract=3Don|off][,tight=3Don|off]`` ``path`` specifies the local path of the unix socket. ``path`` is required. - ``abstract`` specifies the use of the abstract socket namespace, + ``abstract=3Don|off`` specifies the use of the abstract socket nam= espace, rather than the filesystem. Optional, defaults to false. - ``tight`` sets the socket length of abstract sockets to their mini= mum, + ``tight=3Don|off`` sets the socket length of abstract sockets to t= heir minimum, rather than the full sun_path length. Optional, defaults to true. =20 -``-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr][,= localport=3Dlocalport][,ipv4][,ipv6]`` +``-chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr][,= localport=3Dlocalport][,ipv4=3Don|off][,ipv6=3Don|off]`` Sends all traffic from the guest to a remote host over UDP. =20 ``host`` specifies the remote host to connect to. If not specified @@ -3228,7 +3228,7 @@ The available backends are: ``localport`` specifies the local port to bind to. If not specified any available local port will be used. =20 - ``ipv4`` and ``ipv6`` specify that either IPv4 or IPv6 must be used. + ``ipv4=3Don|off`` and ``ipv6=3Don|off`` specify that either IPv4 or IP= v6 must be used. If neither is specified the device may use either protocol. =20 ``-chardev msmouse,id=3Did`` @@ -3592,30 +3592,30 @@ SRST ``telnet options:`` localhost 5555 =20 - ``tcp:[host]:port[,server][,nowait][,nodelay][,reconnect=3Dseconds]`` + ``tcp:[host]:port[,server=3Don|off][,wait=3Don|off][,delay=3Don|off][,= reconnect=3Dseconds]`` The TCP Net Console has two modes of operation. It can send the serial I/O to a location or wait for a connection from a location. By default the TCP Net Console is sent to host at the - port. If you use the server option QEMU will wait for a client + port. If you use the ``server=3Don`` option QEMU will wait for a c= lient socket application to connect to the port before continuing, - unless the ``nowait`` option was specified. The ``nodelay`` - option disables the Nagle buffering algorithm. The ``reconnect`` - option only applies if noserver is set, if the connection goes + unless the ``wait=3Don|off`` option was specified. The ``delay=3Do= n|off`` + option disables the Nagle buffering algorithm. The ``reconnect=3Do= n`` + option only applies if ``server=3Dno`` is set, if the connection g= oes down it will attempt to reconnect at the given interval. If host is omitted, 0.0.0.0 is assumed. Only one TCP connection at a - time is accepted. You can use ``telnet`` to connect to the + time is accepted. You can use ``telnet=3Don`` to connect to the corresponding character device. =20 ``Example to send tcp console to 192.168.0.2 port 4444`` -serial tcp:192.168.0.2:4444 =20 ``Example to listen and wait on port 4444 for connection`` - -serial tcp::4444,server + -serial tcp::4444,server=3Don =20 ``Example to not wait and listen on ip 192.168.0.100 port 4444`` - -serial tcp:192.168.0.100:4444,server,nowait + -serial tcp:192.168.0.100:4444,server=3Don,wait=3Doff =20 - ``telnet:host:port[,server][,nowait][,nodelay]`` + ``telnet:host:port[,server=3Don|off][,wait=3Don|off][,delay=3Don|off]`` The telnet protocol is used instead of raw tcp sockets. The options work the same as if you had specified ``-serial tcp``. The difference is that the port acts like a telnet server or @@ -3625,11 +3625,11 @@ SRST you do it with Control-] and then type "send break" followed by pressing the enter key. =20 - ``websocket:host:port,server[,nowait][,nodelay]`` + ``websocket:host:port,server=3Don[,wait=3Don|off][,delay=3Don|off]`` The WebSocket protocol is used instead of raw tcp socket. The port acts as a WebSocket server. Client mode is not supported. =20 - ``unix:path[,server][,nowait][,reconnect=3Dseconds]`` + ``unix:path[,server=3Don|off][,wait=3Don|off][,reconnect=3Dseconds]`` A unix domain socket is used instead of a tcp socket. The option works the same as if you had specified ``-serial tcp`` except the unix domain socket path is used for connections. @@ -3642,7 +3642,7 @@ SRST multiplex the monitor onto a telnet server listening on port 4444 would be: =20 - ``-serial mon:telnet::4444,server,nowait`` + ``-serial mon:telnet::4444,server=3Don,wait=3Doff`` =20 When the monitor is multiplexed to stdio in this way, Ctrl+C will not terminate QEMU any more but will be passed to the guest @@ -4815,11 +4815,11 @@ SRST primary: -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downs= cript=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,serve= r,nowait - -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r,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,serve= r=3Don,wait=3Doff + -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r=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,se= rver,nowait + -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,se= rver=3Don,wait=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 @@ -4841,13 +4841,13 @@ SRST primary: -netdev tap,id=3Dhn0,vhost=3Doff,script=3D/etc/qemu-ifup,downs= cript=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,serve= r,nowait - -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r,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,serve= r=3Don,wait=3Doff + -chardev socket,id=3Dcompare0,host=3D3.3.3.3,port=3D9001,serve= r=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,se= rver,nowait + -chardev socket,id=3Dcompare_out,host=3D3.3.3.3,port=3D9005,se= rver=3Don,wait=3Doff -chardev socket,id=3Dcompare_out0,host=3D3.3.3.3,port=3D9005 - -chardev socket,id=3Dnotify_way,host=3D3.3.3.3,port=3D9009,ser= ver,nowait + -chardev socket,id=3Dnotify_way,host=3D3.3.3.3,port=3D9009,ser= ver=3Don,wait=3Doff -object filter-mirror,id=3Dm0,netdev=3Dhn0,queue=3Dtx,outdev= =3Dmirror0 -object filter-redirector,netdev=3Dhn0,id=3Dredire0,queue=3Drx= ,indev=3Dcompare_out -object filter-redirector,netdev=3Dhn0,id=3Dredire1,queue=3Drx= ,outdev=3Dcompare0 --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613502846; cv=none; d=zohomail.com; s=zohoarc; b=O9YnOOX2feAc1Ee8bIMEV6VWkfBJ9LlV79bXtx2YpMu9ttZK46DT5CPfucLfb1fMqXFJKlnhn6kNdqEo/tpu4tl541zSujpZ08YnfyUKTa0BahnctJEVtJFcvevhxjLE3v2rG1x+TSb7vXuBWczFRhQ8765ATj4Z4IawWzGdnzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613502846; h=Content-Type:Content-Transfer-Encoding:Cc: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=ZcjZNiNBT2OvO6quvRwvgiDPHr3OJE9iZRkvT09iFu0=; b=fQxusS/S1BoQLyg5LerWBXH67nKdQBlgsYiRo+tamo2Sw79bn4U4jeK63I36K7coLx4EtprsQr5fWD1rKjaxOOXqKQ1VIqsB79uAlqZg1fFcZfPCPYUYLmkcnbdl6+wD2bR/xVR4R0uMoGKTI6aPjgrCh/85Ukqv15degTY8/nY= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613502846573481.8441291104831; Tue, 16 Feb 2021 11:14:06 -0800 (PST) Received: from localhost ([::1]:40936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5nR-0004XP-IC for importer@patchew.org; Tue, 16 Feb 2021 14:14:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kF-0002go-5s for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kC-0004PV-RM for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:46 -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-489-3U0JJmzoNFK4bvWA8DzoKA-1; Tue, 16 Feb 2021 14:10:42 -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 312E7C288; Tue, 16 Feb 2021 19:10:41 +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 77B045C1B4; Tue, 16 Feb 2021 19:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502644; 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=ZcjZNiNBT2OvO6quvRwvgiDPHr3OJE9iZRkvT09iFu0=; b=XlwUMEiupHYvuvPkCsdqb4XpRa+EN5+D4Zy2rMbEAdzx6LKgIQsXAZ+vLZFz320xuEaUCr kLdH1sk7POtcStbD5coUTVqbGV1/Hnhnz5T7yFYA2Yqu5GzkGDZnqGGdm82PNLvUmWI4Bf p6TL5xGjOZeDQKNb//ppYY0yfX5pKWQ= X-MC-Unique: 3U0JJmzoNFK4bvWA8DzoKA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 03/10] qemu-options: update to show preferred boolean syntax for -spice Date: Tue, 16 Feb 2021 19:10:20 +0000 Message-Id: <20210216191027.595031-4-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 --- qemu-options.hx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 972ef412cc..bdf159c929 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1894,16 +1894,17 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, "-spice [port=3Dport][,tls-port=3Dsecured-port][,x509-dir=3D]\n" " [,x509-key-file=3D][,x509-key-password=3D]\n" " [,x509-cert-file=3D][,x509-cacert-file=3D]\n" - " [,x509-dh-key-file=3D][,addr=3Daddr][,ipv4|ipv6|unix]\n" + " [,x509-dh-key-file=3D][,addr=3Daddr]\n" + " [,ipv4=3Don|off][,ipv6=3Don|off][,unix=3Don|off]\n" " [,tls-ciphers=3D]\n" " [,tls-channel=3D[main|display|cursor|inputs|record|playback]]\= n" " [,plaintext-channel=3D[main|display|cursor|inputs|record|playb= ack]]\n" - " [,sasl][,password=3D][,disable-ticketing]\n" + " [,sasl=3Don|off][,password=3D][,disable-ticketing=3Don= |off]\n" " [,image-compression=3D[auto_glz|auto_lz|quic|glz|lz|off]]\n" " [,jpeg-wan-compression=3D[auto|never|always]]\n" " [,zlib-glz-wan-compression=3D[auto|never|always]]\n" - " [,streaming-video=3D[off|all|filter]][,disable-copy-paste]\n" - " [,disable-agent-file-xfer][,agent-mouse=3D[on|off]]\n" + " [,streaming-video=3D[off|all|filter]][,disable-copy-paste=3Don= |off]\n" + " [,disable-agent-file-xfer=3Don|off][,agent-mouse=3D[on|off]]\n" " [,playback-compression=3D[on|off]][,seamless-migration=3D[on|o= ff]]\n" " [,gl=3D[on|off]][,rendernode=3D]\n" " enable spice\n" @@ -1920,13 +1921,13 @@ SRST Set the IP address spice is listening on. Default is any address. =20 - ``ipv4``; \ ``ipv6``; \ ``unix`` + ``ipv4=3Don|off``; \ ``ipv6=3Don|off``; \ ``unix=3Don|off`` Force using the specified IP version. =20 ``password=3D`` Set the password you need to authenticate. =20 - ``sasl`` + ``sasl=3Don|off`` Require that the client use SASL to authenticate with the spice. The exact choice of authentication method used is controlled from the system / user's SASL configuration file for the 'qemu' @@ -1940,13 +1941,13 @@ SRST data encryption preventing compromise of authentication credentials. =20 - ``disable-ticketing`` + ``disable-ticketing=3Don|off`` Allow client connects without authentication. =20 - ``disable-copy-paste`` + ``disable-copy-paste=3Don|off`` Disable copy paste between the client and the guest. =20 - ``disable-agent-file-xfer`` + ``disable-agent-file-xfer=3Don|off`` Disable spice-vdagent based file-xfer between the client and the guest. =20 --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613503092; cv=none; d=zohomail.com; s=zohoarc; b=VeUkTG/Ux5mfvUFfa/g19ppqFJDyASi+uhykEeljay9V+r40CKqUrtb9fyKa2c7jnHzm2DGRPrYz6qGYISjrvoNz7MlHmsMrcmODIo2wrM2b6tCyiBkhycobt+CjTNXfB1sTtOYwSIoxSSARHDn0HpMMYu5hUdAncRwq24Etaw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613503092; h=Content-Type:Content-Transfer-Encoding:Cc: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=1QMZo7a6zYlU5tc6+XTo4wMRuDlcmFm6cTcr1Z5AxYE=; b=YMaZ4tiqEdKX/KneXBMqrimHhV6Rjj3OjQ8jN//WU/rUwJ1wZcdPXY3WUOqHFXQKJYMaLBHFEjJCHZp6JX9mUIHbUVgCnVoBj4TFrraKA1TNWlv5r7goQ9mjIc3oqY4ubXakPEWgXR4nIq9uFxy3iyJZDJyuLhvJ0zpzUJCOdT0= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613503091770221.35270985885654; Tue, 16 Feb 2021 11:18:11 -0800 (PST) Received: from localhost ([::1]:49030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5rO-000860-MM for importer@patchew.org; Tue, 16 Feb 2021 14:18:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kI-0002n9-28 for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24147) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kG-0004Pw-A2 for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:49 -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-356-y_AzCrywPUeuXHQ0TPwmpg-1; Tue, 16 Feb 2021 14:10:43 -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 AC426C284; Tue, 16 Feb 2021 19:10:42 +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 8F0F05C1B4; Tue, 16 Feb 2021 19:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502647; 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=1QMZo7a6zYlU5tc6+XTo4wMRuDlcmFm6cTcr1Z5AxYE=; b=JK5GnqRHzG/RCxjkdq8UWYl4jp0qENhGsGuEq2ZTRRvVPCbZzGhWwgCslpSQ4RplmgSNXb J7X5Nin3EWYaB+upFJcMfzxMp7owyZgZRrmc6IG4gurtLf2MQUPC3w12tu/yFqH2ZZgKVl e/HCYdrexkTam5J88kAiIOCOVIErAFk= X-MC-Unique: y_AzCrywPUeuXHQ0TPwmpg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 04/10] qemu-options: update to show preferred boolean syntax for -netdev Date: Tue, 16 Feb 2021 19:10:21 +0000 Message-Id: <20210216191027.595031-5-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=63.128.21.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_H4=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 --- qemu-options.hx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index bdf159c929..fb2050cda9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2406,8 +2406,8 @@ DEFHEADING(Network options:) =20 DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, #ifdef CONFIG_SLIRP - "-netdev user,id=3Dstr[,ipv4[=3Don|off]][,net=3Daddr[/mask]][,host=3Da= ddr]\n" - " [,ipv6[=3Don|off]][,ipv6-net=3Daddr[/int]][,ipv6-host=3Daddr= ]\n" + "-netdev user,id=3Dstr[,ipv4=3Don|off][,net=3Daddr[/mask]][,host=3Dadd= r]\n" + " [,ipv6=3Don|off][,ipv6-net=3Daddr[/int]][,ipv6-host=3Daddr]\= n" " [,restrict=3Don|off][,hostname=3Dhost][,dhcpstart=3Daddr]\n" " [,dns=3Daddr][,ipv6-dns=3Daddr][,dnssearch=3Ddomain][,domain= name=3Ddomain]\n" " [,tftp=3Ddir][,tftp-server-name=3Dname][,bootfile=3Df][,host= fwd=3Drule][,guestfwd=3Drule]" @@ -2454,8 +2454,8 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, #endif #ifdef __linux__ "-netdev l2tpv3,id=3Dstr,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcpor= t][,dstport=3Ddstport]\n" - " [,rxsession=3Drxsession],txsession=3Dtxsession[,ipv6=3Don/of= f][,udp=3Don/off]\n" - " [,cookie64=3Don/off][,counter][,pincounter][,txcookie=3Dtxco= okie]\n" + " [,rxsession=3Drxsession],txsession=3Dtxsession[,ipv6=3Don|of= f][,udp=3Don|off]\n" + " [,cookie64=3Don|off][,counter][,pincounter][,txcookie=3Dtxco= okie]\n" " [,rxcookie=3Drxcookie][,offset=3Doffset]\n" " configure a network backend with ID 'str' connected t= o\n" " an Ethernet over L2TPv3 pseudowire.\n" @@ -2884,7 +2884,7 @@ SRST -device e1000,netdev=3Dn1,mac=3D52:54:00:12:34:56= \\ -netdev socket,id=3Dn1,mcast=3D239.192.168.1:1102= ,localaddr=3D1.2.3.4 =20 -``-netdev l2tpv3,id=3Did,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcport][,= dstport=3Ddstport],txsession=3Dtxsession[,rxsession=3Drxsession][,ipv6][,ud= p][,cookie64][,counter][,pincounter][,txcookie=3Dtxcookie][,rxcookie=3Drxco= okie][,offset=3Doffset]`` +``-netdev l2tpv3,id=3Did,src=3Dsrcaddr,dst=3Ddstaddr[,srcport=3Dsrcport][,= dstport=3Ddstport],txsession=3Dtxsession[,rxsession=3Drxsession][,ipv6=3Don= |off][,udp=3Don|off][,cookie64][,counter][,pincounter][,txcookie=3Dtxcookie= ][,rxcookie=3Drxcookie][,offset=3Doffset]`` Configure a L2TPv3 pseudowire host network backend. L2TPv3 (RFC3931) is a popular protocol to transport Ethernet (and other Layer 2) data frames between two systems. It is present in routers, firewalls and --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 161350308997915.072238131336348; Tue, 16 Feb 2021 11:18:09 -0800 (PST) Received: from localhost ([::1]:48862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5rM-00081o-Mc for importer@patchew.org; Tue, 16 Feb 2021 14:18:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kK-0002nf-20 for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kH-0004Q3-3L for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:51 -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-1-mdmNCQhIN_Sg7_ZfwuNjew-1; Tue, 16 Feb 2021 14:10:45 -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 385BC10082F5; Tue, 16 Feb 2021 19:10:44 +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 13E015C1B4; Tue, 16 Feb 2021 19:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502648; 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=3MH8R2iLFmSey485r/jtFELxBHqIKye+LJZy/uTIPL0=; b=iCWtkGR0UTtfje1iKsQLdoWqh9lIbJlNMrWu4whE4a5Q47ztoc2aiTSHjAIxA+C1u1/So4 XkVv9rdWQh2L099JVC+ACobzaf2kvUrzrGaUWpDRH+RwMSe3Fn0AYlz9NG0xCDD2gaYVAC mvLAPrwhaMudOGueKbgwg7ky65KmQps= X-MC-Unique: mdmNCQhIN_Sg7_ZfwuNjew-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 05/10] qemu-options: update to show preferred boolean syntax for -incoming Date: Tue, 16 Feb 2021 19:10:22 +0000 Message-Id: <20210216191027.595031-6-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 --- qemu-options.hx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index fb2050cda9..da0ddf8a3a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4135,8 +4135,8 @@ SRST ERST =20 DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ - "-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4][,ipv6]\n" \ - "-incoming rdma:host:port[,ipv4][,ipv6]\n" \ + "-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4=3Don|off][,ipv6=3Don|o= ff]\n" \ + "-incoming rdma:host:port[,ipv4=3Don|off][,ipv6=3Don|off]\n" \ "-incoming unix:socketpath\n" \ " prepare for incoming migration, listen on\n" \ " specified protocol and socket address\n" \ @@ -4148,9 +4148,9 @@ DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ " wait for the URI to be specified via migrate_incoming= \n", QEMU_ARCH_ALL) SRST -``-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4][,ipv6]`` +``-incoming tcp:[host]:port[,to=3Dmaxport][,ipv4=3Don|off][,ipv6=3Don|off]= `` \=20 -``-incoming rdma:host:port[,ipv4][,ipv6]`` +``-incoming rdma:host:port[,ipv4=3Don|off][,ipv6=3Don|off]`` Prepare for incoming migration, listen on a given tcp port. =20 ``-incoming unix:socketpath`` --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613503372; cv=none; d=zohomail.com; s=zohoarc; b=brMwH3KkTT+KQojdoQANR3JugZoNMnOWtJ76XgPAmPZi783Vdvwqf8ASwwPA/epsnUBRiWBHhtJIC4NGfWo0cxPjvplz74JJsSWmyERd9hxuvbfQHVNsvN0LlrchxWCDdDr7ILUC+O4uCWGEs8FLFBEiRbzU4jr6/ggoJNF2av4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613503372; h=Content-Type:Content-Transfer-Encoding:Cc: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=GZPTmJ8LNbLOv9fwAIwYBhRAogi9qA1B6gydG57uNUo=; b=XuGHpdmfDUKz7pnimNX7XTr4MdTKrV+M7e8ZA8Re022MaBvioQ5fSMzy4Pegg5hSs10q1wQqnQFyoauXwi+TUQOrBLGLL2a7Js9A3garl8O9xJhhPVy2NKRT6G/tXgtPXA/w4ODn5qLZ6CAYiGF6SKxqu7cbP+ksouQP55OlNjk= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613503371774922.5957054857133; Tue, 16 Feb 2021 11:22:51 -0800 (PST) Received: from localhost ([::1]:57454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5vu-0003Gx-OC for importer@patchew.org; Tue, 16 Feb 2021 14:22:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kL-0002oH-Uq for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kH-0004QB-JN for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:52 -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-107-EJPPTYw0PqCcbMz7n5qhiA-1; Tue, 16 Feb 2021 14:10:46 -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 BA7981846096; Tue, 16 Feb 2021 19:10:45 +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 A07955C1B4; Tue, 16 Feb 2021 19:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502649; 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=GZPTmJ8LNbLOv9fwAIwYBhRAogi9qA1B6gydG57uNUo=; b=WDHkf0P4f2QEUYavlbGlG3GmqKa3QqvUBv/G2MXjqgSuNBRGkYH2rRfVUwl9EM1I4TN6sW r9hC7eFk+ASpu2BeFFsDOHEsyaff/26Ez6tO3QvGMJmhjY957mBXT5D7pXL0T0JyIlFCCe x1spuASqmmGBavXaMl52sZX8XExYjHM= X-MC-Unique: EJPPTYw0PqCcbMz7n5qhiA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 06/10] qemu-options: update to show preferred boolean syntax for -vnc Date: Tue, 16 Feb 2021 19:10:23 +0000 Message-Id: <20210216191027.595031-7-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". The on|off syntax has been supported since -vnc switched to use QemuOpts in commit 4db14629c38611061fc19ec6927405923de84f08 Signed-off-by: Daniel P. Berrang=C3=A9 --- qemu-options.hx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index da0ddf8a3a..34be5a7a2d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2123,13 +2123,13 @@ SRST Following the display value there may be one or more option flags separated by commas. Valid options are =20 - ``reverse`` + ``reverse=3Don|off`` Connect to a listening VNC client via a "reverse" connection. The client is specified by the display. For reverse network connections (host:d,``reverse``), the d argument is a TCP port number, not a display number. =20 - ``websocket`` + ``websocket=3Don|off`` Opens an additional TCP listening port dedicated to VNC Websocket connections. If a bare websocket option is given, the Websocket port is 5700+display. An alternative port can be @@ -2143,7 +2143,7 @@ SRST runs in unencrypted mode. If TLS credentials are provided, the websocket connection requires encrypted client connections. =20 - ``password`` + ``password=3Don|off`` Require that password based authentication is used for client connections. =20 @@ -2180,7 +2180,7 @@ SRST on the fly while the VNC server is active. If missing, it will default to denying access. =20 - ``sasl`` + ``sasl=3Don|off`` Require that the client use SASL to authenticate with the VNC server. The exact choice of authentication method used is controlled from the system / user's SASL configuration file for @@ -2203,7 +2203,7 @@ SRST fly while the VNC server is active. If missing, it will default to denying access. =20 - ``acl`` + ``acl=3Don|off`` Legacy method for enabling authorization of clients against the x509 distinguished name and SASL username. It results in the creation of two ``authz-list`` objects with IDs of @@ -2213,13 +2213,13 @@ SRST This option is deprecated and should no longer be used. The new ``sasl-authz`` and ``tls-authz`` options are a replacement. =20 - ``lossy`` + ``lossy=3Don|off`` Enable lossy compression methods (gradient, JPEG, ...). If this option is set, VNC client may receive lossy framebuffer updates depending on its encoding settings. Enabling this option can save a lot of bandwidth at the expense of quality. =20 - ``non-adaptive`` + ``non-adaptive=3Don|off`` Disable adaptive encodings. Adaptive encodings are enabled by default. An adaptive encoding will try to detect frequently updated screen regions, and send updates in these regions using @@ -2254,7 +2254,7 @@ SRST must be omitted, otherwise is must be present and specify a valid audiodev. =20 - ``power-control`` + ``power-control=3Don|off`` Permit the remote client to issue shutdown, reboot or reset power control requests. ERST --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613503557; cv=none; d=zohomail.com; s=zohoarc; b=CWXhA1So3eotxAjh+2LUnT8wskHirpZ5kapnpyKkC75Zt9yPOquct/qmbphe+qTdC31g5A6X6qFKXAvxw5+7EGcyzrJiDtIQVWuhwT2KRVFHCAMstaYpM4ShTWJKmNTPrBegcjuhfnVSF5+qYvHmnbJ3vuLLcy7vX3I4xtO2BMc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613503557; h=Content-Type:Content-Transfer-Encoding:Cc: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=NvS9JMx0xN3JD8dmM5g6yF3UCasMmjlH5eE0n3m1QT8=; b=T/1gkHVKs/65wfAePggiGljzzS/L+MMDYeuROJ6/zCSeU7FczOlpGhmd9JcQhBARS1Ge69KBlMS02fi/X4ziAQzn5ae7aSg5U66n3eHMPRREelkVyfZaI/EfGnASx/ANWiftgWXoDuBuGQjq42QMzJvp5rZOU7Ta3Hlf1vGQA1k= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613503557384977.9787372559709; Tue, 16 Feb 2021 11:25:57 -0800 (PST) Received: from localhost ([::1]:35736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5yt-00064n-5W for importer@patchew.org; Tue, 16 Feb 2021 14:25:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kP-0002po-VK for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:11:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kN-0004Ri-CC for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:57 -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-469-dF_LwkEJNSWpLRSV4jLb8A-1; Tue, 16 Feb 2021 14:10:50 -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 13F608030C2; Tue, 16 Feb 2021 19:10:49 +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 B92F25C1B4; Tue, 16 Feb 2021 19:10:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502653; 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=NvS9JMx0xN3JD8dmM5g6yF3UCasMmjlH5eE0n3m1QT8=; b=Lg19sePOu6HpDpbNvPfI9TI1fwzo5XhUe4GL4PHYAD1+BlSL8qo3SG/C0qFc9K5PQ+RgXP rU1kaAytApuXF3ZAsz9tXMGtnEUxm1jxiUqcufu6x0nOXtCYkKClx8CkU740O+TdRBjLA6 oZGoqUiwOfyicq2vXn30fx/9erc60qw= X-MC-Unique: dF_LwkEJNSWpLRSV4jLb8A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/10] docs: update to show preferred boolean syntax for -vnc Date: Tue, 16 Feb 2021 19:10:25 +0000 Message-Id: <20210216191027.595031-9-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". The on|off syntax has been supported since -vnc switched to use QemuOpts in commit 4db14629c38611061fc19ec6927405923de84f08 Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/vnc-security.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/system/vnc-security.rst b/docs/system/vnc-security.rst index ebca656d87..830f6acc73 100644 --- a/docs/system/vnc-security.rst +++ b/docs/system/vnc-security.rst @@ -44,7 +44,7 @@ the password all clients will be rejected. =20 .. parsed-literal:: =20 - |qemu_system| [...OPTIONS...] -vnc :1,password -monitor stdio + |qemu_system| [...OPTIONS...] -vnc :1,password=3Don -monitor stdio (qemu) change vnc password Password: ******** (qemu) @@ -104,7 +104,7 @@ authentication to provide two layers of authentication = for clients. =20 |qemu_system| [...OPTIONS...] \ -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ - -vnc :1,tls-creds=3Dtls0,password -monitor stdio + -vnc :1,tls-creds=3Dtls0,password=3Don -monitor stdio (qemu) change vnc password Password: ******** (qemu) @@ -128,7 +128,7 @@ can be launched with: =20 .. parsed-literal:: =20 - |qemu_system| [...OPTIONS...] -vnc :1,sasl -monitor stdio + |qemu_system| [...OPTIONS...] -vnc :1,sasl=3Don -monitor stdio =20 .. _vnc_005fsec_005fcertificate_005fsasl: =20 @@ -146,7 +146,7 @@ x509 options: =20 |qemu_system| [...OPTIONS...] \ -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ - -vnc :1,tls-creds=3Dtls0,sasl -monitor stdio + -vnc :1,tls-creds=3Dtls0,sasl=3Don -monitor stdio =20 .. _vnc_005fsetup_005fsasl: =20 --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613503363; cv=none; d=zohomail.com; s=zohoarc; b=VElct52TyVaIV6Ke4G1hWUYS6+HlO5a4sAet/QggpxSC0X/PJWLisgGfwwtXMYWdSphCf8vTmaFR0Mt1a0RYo/YlXSBI8OPBDcwxiqkooGMPsaTbqj7onmv6NnsY7N76W6bZB+5p28365pkCcm593k/Lvglf/6yd+NSCDJ7TEJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613503363; h=Content-Type:Content-Transfer-Encoding:Cc: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=3+qfql7FG2SX7yHDSS/GvN5uDCqNUizWaV9ofIpjAa0=; b=NKZ6121LouXI8lP1+CwIQPg58Y5aTH/G0ubk57YnnEbV5qLoQ0OdwiGGhAmmx9DVcz3VhzHPqYUnz3pl1cgXJk1e/G4X5GZXvaXnQaPVWFWk8X8re7QVSPyDpWyByalODSvygGm+mG91+27xK6j3YCYW9muzdLjS9R10SDG0ceM= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613503362929798.9755814536869; Tue, 16 Feb 2021 11:22:42 -0800 (PST) Received: from localhost ([::1]:57356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5vl-0003EZ-WD for importer@patchew.org; Tue, 16 Feb 2021 14:22:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kS-0002qF-0t for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:11:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kN-0004Rk-CJ for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:10:59 -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-223-vhvK7uoNMgW9ZFA-X4DKbQ-1; Tue, 16 Feb 2021 14:10:51 -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 9B66C801965; Tue, 16 Feb 2021 19:10:50 +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 68CB25C1B4; Tue, 16 Feb 2021 19:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502654; 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=3+qfql7FG2SX7yHDSS/GvN5uDCqNUizWaV9ofIpjAa0=; b=NXEg1feDJt+fNQnCt8vDYnIcHhRo9nmK7xVwUXQnGqNQVAdXqaCMTeJFn0nwgDoQ9nDWXH 8WNtpmqo/L0AoihJLSC7FEq78SkdZb5LA1qIWye+HrCpWtZ5DnZMTEY2Zi54whojDzC/ob yMXT8SrfxCiXJusAb7XbiwQ9ZnjKMfk= X-MC-Unique: vhvK7uoNMgW9ZFA-X4DKbQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 09/10] docs: update to show preferred boolean syntax for -cpu Date: Tue, 16 Feb 2021 19:10:26 +0000 Message-Id: <20210216191027.595031-10-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 "-foo" Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/COLO-FT.txt | 4 ++-- docs/interop/firmware.json | 2 +- docs/system/cpu-models-x86.rst.inc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index 8874690e83..8d6d53a5a2 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -158,7 +158,7 @@ instance. =20 # imagefolder=3D"/mnt/vms/colo-test-primary" =20 -# qemu-system-x86_64 -enable-kvm -cpu qemu64,+kvmclock -m 512 -smp 1 -qmp = stdio \ +# qemu-system-x86_64 -enable-kvm -cpu qemu64,kvmclock=3Don -m 512 -smp 1 -= qmp stdio \ -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 \ @@ -189,7 +189,7 @@ any IP's here, except for the $primary_ip variable. =20 # qemu-img create -f qcow2 $imagefolder/secondary-hidden.qcow2 10G =20 -# qemu-system-x86_64 -enable-kvm -cpu qemu64,+kvmclock -m 512 -smp 1 -qmp = stdio \ +# qemu-system-x86_64 -enable-kvm -cpu qemu64,kvmclock=3Don -m 512 -smp 1 -= qmp stdio \ -device piix3-usb-uhci -device usb-tablet -name secondary \ -netdev tap,id=3Dhn0,vhost=3Doff,helper=3D/usr/lib/qemu/qemu-bridge-hel= per \ -device rtl8139,id=3De0,netdev=3Dhn0 \ diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 989f10b626..9d94ccafa9 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -129,7 +129,7 @@ # "-machine smm=3Don". (On the "pc-q35-*" machine types of # the @i386 emulation target, @requires-smm presents # further CPU requirements; one combination known to work -# is "-cpu coreduo,-nx".) If the firmware is marked as +# is "-cpu coreduo,nx=3Doff".) If the firmware is marked as # both @secure-boot and @requires-smm, then write # accesses to the pflash chip (NVRAM) that holds the UEFI # variable store must be restricted to code that executes diff --git a/docs/system/cpu-models-x86.rst.inc b/docs/system/cpu-models-x8= 6.rst.inc index 9a2327828e..867c8216b5 100644 --- a/docs/system/cpu-models-x86.rst.inc +++ b/docs/system/cpu-models-x86.rst.inc @@ -364,7 +364,7 @@ Host passthrough with feature customization: =20 .. parsed-literal:: =20 - |qemu_system| -cpu host,-vmx,... + |qemu_system| -cpu host,vmx=3Doff,... =20 Named CPU models: =20 @@ -376,7 +376,7 @@ Named CPU models with feature customization: =20 .. parsed-literal:: =20 - |qemu_system| -cpu Westmere,+pcid,... + |qemu_system| -cpu Westmere,pcid=3Don,... =20 Libvirt guest XML ^^^^^^^^^^^^^^^^^ --=20 2.29.2 From nobody Tue Nov 18 22:46:03 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 ARC-Seal: i=1; a=rsa-sha256; t=1613503118; cv=none; d=zohomail.com; s=zohoarc; b=X9KgGZbzg5X0RlnqT1Doel8JC/NzctU7s401OCSYWua7D9l/uh5+lSWfs3I/mmVNZ2W+u6yiW2mYUbeU+3A1mZF7BfjUgs6zSa+uWTDDesLmz8ETCQENmWNtc2ufKxz77KbPPne9u6X9BEUlETDj2UrwdDxkwcRYS7Gcf6pj3EA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613503118; h=Content-Type:Content-Transfer-Encoding:Cc: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=bYu1HcfbRjMDOL+3Zu/RTEPh1T7xwLWjSMQEHtMFLQY=; b=aku5pebW8+ht2VSOgz5GTP2gRUPcMNoM83nGrX71X/ibzvOugOqF5agDWK4d7M3qE09meTF1O5iWr2zwRmUG+RgpKE0qC7b1ZK4oTuhJwg3baHrNOzplSe7fiaAHSjmTt+lKcIxq7LIO42+eWKO7BaefhbuudpKphioMIfDJgLU= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613503118578476.8390978711594; Tue, 16 Feb 2021 11:18:38 -0800 (PST) Received: from localhost ([::1]:49816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5ro-0008SY-H2 for importer@patchew.org; Tue, 16 Feb 2021 14:18:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kX-0002qj-V2 for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:11:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kP-0004Rv-Lx for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:11:02 -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-602--KIKbPseNZWYL8JiLEQcXA-1; Tue, 16 Feb 2021 14:10:53 -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 2A9F41842A99; Tue, 16 Feb 2021 19:10:52 +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 E6C785C1B4; Tue, 16 Feb 2021 19:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502655; 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=bYu1HcfbRjMDOL+3Zu/RTEPh1T7xwLWjSMQEHtMFLQY=; b=CkM6LHzYhlqdst7dqtBfMukZDyNS0gxYt13uaGak/+KVZEEOICCZLR+awji7+j6m7aUf9Q 3o5eznpop3pN7h0jiDG36Mre+/XcVS3HDbrxWcJoaCWWWtuC/qKvxBpcm0vL342mT6PCzp nN/H2tjBeOWmRYPFGnMASnQG7RWENQo= X-MC-Unique: -KIKbPseNZWYL8JiLEQcXA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 10/10] target/i386: update to show preferred boolean syntax for -cpu Date: Tue, 16 Feb 2021 19:10:27 +0000 Message-Id: <20210216191027.595031-11-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=63.128.21.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_H4=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 "-foo" Signed-off-by: Daniel P. Berrang=C3=A9 --- target/i386/cpu.c | 2 +- tests/qtest/test-x86-cpuid-compat.c | 52 ++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9c3d2d60b7..a5091cc85c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6451,7 +6451,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Erro= r **errp) } else if (cpu->env.cpuid_min_level < 0x14) { mark_unavailable_features(cpu, FEAT_7_0_EBX, CPUID_7_0_EBX_INTEL_PT, - "Intel PT need CPUID leaf 0x14, please set by \"-cpu .= ..,+intel-pt,min-level=3D0x14\""); + "Intel PT need CPUID leaf 0x14, please set by \"-cpu .= ..,intel-pt=3Don,min-level=3D0x14\""); } } =20 diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 7ca1883a29..6470f0a85d 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -235,82 +235,82 @@ int main(int argc, char **argv) /* If level is not large enough, it should increase automatically: */ /* CPUID[6].EAX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/arat", - "-cpu 486,+arat", "level", 6); + "-cpu 486,arat=3Don", "level", 6); /* CPUID[EAX=3D7,ECX=3D0].EBX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/fsgsbase", - "-cpu phenom,+fsgsbase", "level", 7); + "-cpu phenom,fsgsbase=3Don", "level", 7); /* CPUID[EAX=3D7,ECX=3D0].ECX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/avx512vbmi", - "-cpu phenom,+avx512vbmi", "level", 7); + "-cpu phenom,avx512vbmi=3Don", "level", 7); /* CPUID[EAX=3D0xd,ECX=3D1].EAX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/xsaveopt", - "-cpu phenom,+xsaveopt", "level", 0xd); + "-cpu phenom,xsaveopt=3Don", "level", 0xd); /* CPUID[8000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/3dnow", - "-cpu 486,+3dnow", "xlevel", 0x80000001); + "-cpu 486,3dnow=3Don", "xlevel", 0x80000001); /* CPUID[8000_0001].ECX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/sse4a", - "-cpu 486,+sse4a", "xlevel", 0x80000001); + "-cpu 486,sse4a=3Don", "xlevel", 0x80000001); /* CPUID[8000_0007].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/invtsc", - "-cpu 486,+invtsc", "xlevel", 0x80000007); + "-cpu 486,invtsc=3Don", "xlevel", 0x80000007); /* CPUID[8000_000A].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", - "-cpu 486,+svm,+npt", "xlevel", 0x8000000A); + "-cpu 486,svm=3Don,npt=3Don", "xlevel", 0x8000000A); /* CPUID[C000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", - "-cpu phenom,+xstore", "xlevel2", 0xC0000001); + "-cpu phenom,xstore=3Don", "xlevel2", 0xC0000001); /* SVM needs CPUID[0x8000000A] */ add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", - "-cpu athlon,+svm", "xlevel", 0x8000000A); + "-cpu athlon,svm=3Don", "xlevel", 0x8000000A); =20 =20 /* If level is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-level/SandyBridge/multiple", - "-cpu SandyBridge,+arat,+fsgsbase,+avx512vbmi", + "-cpu SandyBridge,arat=3Don,fsgsbase=3Don,avx512vbmi=3D= on", "level", 0xd); /* If level is explicitly set, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-level/486/fixed/0xF", - "-cpu 486,level=3D0xF,+arat,+fsgsbase,+avx512vbmi,+xsav= eopt", + "-cpu 486,level=3D0xF,arat=3Don,fsgsbase=3Don,avx512vbm= i=3Don,xsaveopt=3Don", "level", 0xF); add_cpuid_test("x86/cpuid/auto-level/486/fixed/2", - "-cpu 486,level=3D2,+arat,+fsgsbase,+avx512vbmi,+xsaveo= pt", + "-cpu 486,level=3D2,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", "level", 2); add_cpuid_test("x86/cpuid/auto-level/486/fixed/0", - "-cpu 486,level=3D0,+arat,+fsgsbase,+avx512vbmi,+xsaveo= pt", + "-cpu 486,level=3D0,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", "level", 0); =20 /* if xlevel is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow", - "-cpu phenom,+3dnow,+sse4a,+invtsc,+npt,+svm", + "-cpu phenom,3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don= ,svm=3Don", "xlevel", 0x8000001A); /* If xlevel is explicitly set, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002", - "-cpu 486,xlevel=3D0x80000002,+3dnow,+sse4a,+invtsc,+np= t,+svm", + "-cpu 486,xlevel=3D0x80000002,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", "xlevel", 0x80000002); add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A", - "-cpu 486,xlevel=3D0x8000001A,+3dnow,+sse4a,+invtsc,+np= t,+svm", + "-cpu 486,xlevel=3D0x8000001A,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", "xlevel", 0x8000001A); add_cpuid_test("x86/cpuid/auto-xlevel/phenom/fixed/0", - "-cpu 486,xlevel=3D0,+3dnow,+sse4a,+invtsc,+npt,+svm", + "-cpu 486,xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", "xlevel", 0); =20 /* if xlevel2 is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel2/486/fixed", - "-cpu 486,xlevel2=3D0xC0000002,+xstore", + "-cpu 486,xlevel2=3D0xC0000002,xstore=3Don", "xlevel2", 0xC0000002); =20 /* Check compatibility of old machine-types that didn't * auto-increase level/xlevel/xlevel2: */ =20 add_cpuid_test("x86/cpuid/auto-level/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+arat,+avx512vbmi,+xsa= veopt", + "-machine pc-i440fx-2.7 -cpu 486,arat=3Don,avx512vbmi= =3Don,xsaveopt=3Don", "level", 1); add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+3dnow,+sse4a,+invtsc,= +npt,+svm", + "-machine pc-i440fx-2.7 -cpu 486,3dnow=3Don,sse4a=3Don,= invtsc=3Don,npt=3Don,svm=3Don", "xlevel", 0); add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+xstore", + "-machine pc-i440fx-2.7 -cpu 486,xstore=3Don", "xlevel2", 0); /* * QEMU 1.4.0 had auto-level enabled for CPUID[7], already, @@ -321,19 +321,19 @@ int main(int argc, char **argv) "-machine pc-i440fx-1.4 -cpu Nehalem", "level", 2); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-1.5/on", - "-machine pc-i440fx-1.4 -cpu Nehalem,+smap", + "-machine pc-i440fx-1.4 -cpu Nehalem,smap=3Don", "level", 7); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off", "-machine pc-i440fx-2.3 -cpu Penryn", "level", 4); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/on", - "-machine pc-i440fx-2.3 -cpu Penryn,+erms", + "-machine pc-i440fx-2.3 -cpu Penryn,erms=3Don", "level", 7); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", "-machine pc-i440fx-2.9 -cpu Conroe", "level", 10); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on", - "-machine pc-i440fx-2.9 -cpu Conroe,+erms", + "-machine pc-i440fx-2.9 -cpu Conroe,erms=3Don", "level", 10); =20 /* @@ -348,7 +348,7 @@ int main(int argc, char **argv) "-machine pc-i440fx-2.4 -cpu SandyBridge,", "xlevel", 0x80000008); add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on", - "-machine pc-i440fx-2.4 -cpu SandyBridge,+svm,+npt", + "-machine pc-i440fx-2.4 -cpu SandyBridge,svm=3Don,npt= =3Don", "xlevel", 0x80000008); =20 /* Test feature parsing */ --=20 2.29.2