From nobody Fri Dec 19 05:42:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607604668; cv=none; d=zohomail.com; s=zohoarc; b=ex97XtzFJOH3RV8HrGrTBjzWR9icJ2AAp0UCv4WtngZEXw4Vy6PleNE1XDq7DCfJlzB+2GKEkobFUgar1w5+tfW1gYDuPl0fV9ErdPVvLr7t7J0oXMjkS+/rcG1BlDhYG2JusaxMai3AmugHe0MKFW0+qanlhvb7KuHSWvUIsWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607604668; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jIJosOG3HoXyJ0KUKSyD2m9e6xU5iQS9RJxafClwmxk=; b=gGp6vWDs/unBaTs5qvUszQJZ5FRBJqVw4XEF6FqyPZApXUve5JDl2Q9wmVXDC7olpw+Z/cclM7b2sLqa/NYjoU++t/R9FQg9dL3JW6Q7XYXvscNKganKyWgrttQe1672bgvu9N6HUL9LzXk2NdzNrHByxHVA08lWAG+jXcBYqP8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607604668284277.88148951905634; Thu, 10 Dec 2020 04:51:08 -0800 (PST) Received: from localhost ([::1]:50742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLPX-00007k-2j for importer@patchew.org; Thu, 10 Dec 2020 07:51:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKur-0001kL-Pp for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:19:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28213) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKul-0000Ho-II for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:19:25 -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-396-fXpPvsJ_Ogyi6eqCgkErCw-1; Thu, 10 Dec 2020 07:19:16 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5AADF1800D42 for ; Thu, 10 Dec 2020 12:19:15 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2016460BF1 for ; Thu, 10 Dec 2020 12:19:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jIJosOG3HoXyJ0KUKSyD2m9e6xU5iQS9RJxafClwmxk=; b=Shnv0n4ZAoJqX73Ahx6ul9Gj0nKDyihc2dNFrxjGTfSBUpNQ/KE2BttBIs5Lb334mXcn1r 6+2Kca4blBl3DvyLJe5PgOTJKfDMKveAN9Lxs36ujI1kWn1R7ZEtZS1npqXXzDYJrW/pCV KpzizPCOw6cZdcf9AO7cu4HG7KRqgLg= X-MC-Unique: fXpPvsJ_Ogyi6eqCgkErCw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 051/113] treewide: do not use short-form boolean options Date: Thu, 10 Dec 2020 07:19:13 -0500 Message-Id: <20201210121913.531490-4-pbonzini@redhat.com> In-Reply-To: <20201210121913.531490-1-pbonzini@redhat.com> References: <20201210121913.531490-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" They are going to be deprecated, avoid warnings on stdout while the tests run. Signed-off-by: Paolo Bonzini --- docs/specs/tpm.rst | 2 +- python/qemu/machine.py | 2 +- qemu-options.hx | 32 ++++++++++++++-------------- tests/qtest/bios-tables-test.c | 4 ++-- tests/qtest/pflash-cfi02-test.c | 4 ++-- tests/qtest/test-filter-redirector.c | 8 +++---- tests/qtest/vhost-user-test.c | 8 +++---- tests/test-char.c | 8 +++---- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index 5e9aef4db3..3be190343a 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -343,7 +343,7 @@ In case an Arm virt machine is emulated, use the follow= ing command line: -device tpm-tis-device,tpmdev=3Dtpm0 \ -device virtio-blk-pci,drive=3Ddrv0 \ -drive format=3Dqcow2,file=3Dhda.qcow2,if=3Dnone,id=3Ddrv0 \ - -drive if=3Dpflash,format=3Draw,file=3Dflash0.img,readonly \ + -drive if=3Dpflash,format=3Draw,file=3Dflash0.img,readonly=3Don \ -drive if=3Dpflash,format=3Draw,file=3Dflash1.img =20 In case SeaBIOS is used as firmware, it should show the TPM menu item diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 64d966aeeb..7a40f4604b 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -292,7 +292,7 @@ class QEMUMachine: for _ in range(self._console_index): args.extend(['-serial', 'null']) if self._console_set: - chardev =3D ('socket,id=3Dconsole,path=3D%s,server,nowait' % + chardev =3D ('socket,id=3Dconsole,path=3D%s,server=3Don,wait= =3Doff' % self._console_address) args.extend(['-chardev', chardev]) if self._console_device_type is None: diff --git a/qemu-options.hx b/qemu-options.hx index 104632ea34..e60ad42976 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1406,25 +1406,25 @@ ERST =20 DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev, "-fsdev local,id=3Did,path=3Dpath,security_model=3Dmapped-xattr|mapped= -file|passthrough|none\n" - " [,writeout=3Dimmediate][,readonly][,fmode=3Dfmode][,dmode=3Ddmode]\n" + " [,writeout=3Dimmediate][,readonly=3Don][,fmode=3Dfmode][,dmode=3Ddmo= de]\n" " [[,throttling.bps-total=3Db]|[[,throttling.bps-read=3Dr][,throttling= .bps-write=3Dw]]]\n" " [[,throttling.iops-total=3Di]|[[,throttling.iops-read=3Dr][,throttli= ng.iops-write=3Dw]]]\n" " [[,throttling.bps-total-max=3Dbm]|[[,throttling.bps-read-max=3Drm][,= throttling.bps-write-max=3Dwm]]]\n" " [[,throttling.iops-total-max=3Dim]|[[,throttling.iops-read-max=3Dirm= ][,throttling.iops-write-max=3Diwm]]]\n" " [[,throttling.iops-size=3Dis]]\n" - "-fsdev proxy,id=3Did,socket=3Dsocket[,writeout=3Dimmediate][,readonly= ]\n" - "-fsdev proxy,id=3Did,sock_fd=3Dsock_fd[,writeout=3Dimmediate][,readon= ly]\n" + "-fsdev proxy,id=3Did,socket=3Dsocket[,writeout=3Dimmediate][,readonly= =3Don]\n" + "-fsdev proxy,id=3Did,sock_fd=3Dsock_fd[,writeout=3Dimmediate][,readon= ly=3Don]\n" "-fsdev synth,id=3Did\n", QEMU_ARCH_ALL) =20 SRST -``-fsdev local,id=3Did,path=3Dpath,security_model=3Dsecurity_model [,write= out=3Dwriteout][,readonly][,fmode=3Dfmode][,dmode=3Ddmode] [,throttling.opt= ion=3Dvalue[,throttling.option=3Dvalue[,...]]]`` +``-fsdev local,id=3Did,path=3Dpath,security_model=3Dsecurity_model [,write= out=3Dwriteout][,readonly=3Don][,fmode=3Dfmode][,dmode=3Ddmode] [,throttlin= g.option=3Dvalue[,throttling.option=3Dvalue[,...]]]`` \=20 -``-fsdev proxy,id=3Did,socket=3Dsocket[,writeout=3Dwriteout][,readonly]`` +``-fsdev proxy,id=3Did,socket=3Dsocket[,writeout=3Dwriteout][,readonly=3Do= n]`` \ -``-fsdev proxy,id=3Did,sock_fd=3Dsock_fd[,writeout=3Dwriteout][,readonly]`` +``-fsdev proxy,id=3Did,sock_fd=3Dsock_fd[,writeout=3Dwriteout][,readonly= =3Don]`` \ -``-fsdev synth,id=3Did[,readonly]`` +``-fsdev synth,id=3Did[,readonly=3Don]`` Define a new file system device. Valid options are: =20 ``local`` @@ -1467,7 +1467,7 @@ SRST guest only when the data has been reported as written by the storage subsystem. =20 - ``readonly`` + ``readonly=3Don`` Enables exporting 9p share as a readonly mount for guests. By default read-write access is given. =20 @@ -1532,18 +1532,18 @@ ERST =20 DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs, "-virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3Dmapped-xat= tr|mapped-file|passthrough|none\n" - " [,id=3Did][,writeout=3Dimmediate][,readonly][,fmode=3Dfmode][= ,dmode=3Ddmode][,multidevs=3Dremap|forbid|warn]\n" - "-virtfs proxy,mount_tag=3Dtag,socket=3Dsocket[,id=3Did][,writeout=3Di= mmediate][,readonly]\n" - "-virtfs proxy,mount_tag=3Dtag,sock_fd=3Dsock_fd[,id=3Did][,writeout= =3Dimmediate][,readonly]\n" - "-virtfs synth,mount_tag=3Dtag[,id=3Did][,readonly]\n", + " [,id=3Did][,writeout=3Dimmediate][,readonly=3Don][,fmode=3Dfm= ode][,dmode=3Ddmode][,multidevs=3Dremap|forbid|warn]\n" + "-virtfs proxy,mount_tag=3Dtag,socket=3Dsocket[,id=3Did][,writeout=3Di= mmediate][,readonly=3Don]\n" + "-virtfs proxy,mount_tag=3Dtag,sock_fd=3Dsock_fd[,id=3Did][,writeout= =3Dimmediate][,readonly=3Don]\n" + "-virtfs synth,mount_tag=3Dtag[,id=3Did][,readonly=3Don]\n", QEMU_ARCH_ALL) =20 SRST -``-virtfs local,path=3Dpath,mount_tag=3Dmount_tag ,security_model=3Dsecuri= ty_model[,writeout=3Dwriteout][,readonly] [,fmode=3Dfmode][,dmode=3Ddmode][= ,multidevs=3Dmultidevs]`` +``-virtfs local,path=3Dpath,mount_tag=3Dmount_tag ,security_model=3Dsecuri= ty_model[,writeout=3Dwriteout][,readonly=3Don] [,fmode=3Dfmode][,dmode=3Ddm= ode][,multidevs=3Dmultidevs]`` \=20 -``-virtfs proxy,socket=3Dsocket,mount_tag=3Dmount_tag [,writeout=3Dwriteou= t][,readonly]`` +``-virtfs proxy,socket=3Dsocket,mount_tag=3Dmount_tag [,writeout=3Dwriteou= t][,readonly=3Don]`` \=20 -``-virtfs proxy,sock_fd=3Dsock_fd,mount_tag=3Dmount_tag [,writeout=3Dwrite= out][,readonly]`` +``-virtfs proxy,sock_fd=3Dsock_fd,mount_tag=3Dmount_tag [,writeout=3Dwrite= out][,readonly=3Don]`` \ ``-virtfs synth,mount_tag=3Dmount_tag`` Define a new virtual filesystem device and expose it to the guest using @@ -1598,7 +1598,7 @@ SRST guest only when the data has been reported as written by the storage subsystem. =20 - ``readonly`` + ``readonly=3Don`` Enables exporting 9p share as a readonly mount for guests. By default read-write access is given. =20 diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 64a9a772ee..4cb523dfb7 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -674,14 +674,14 @@ static void test_acpi_one(const char *params, test_da= ta *data) if (data->cd) { args =3D g_strdup_printf("-machine %s %s -accel tcg " "-nodefaults -nographic " - "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly " + "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don -= cdrom %s %s", data->machine, data->tcg_only ? "" : "-accel kvm", data->uefi_fl1, data->uefi_fl2, data->cd, params ? params = : ""); } else { args =3D g_strdup_printf("-machine %s %s -accel tcg " "-nodefaults -nographic " - "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly " + "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don %= s", data->machine, data->tcg_only ? "" : "-accel kvm", data->uefi_fl1, data->uefi_fl2, params ? params : ""); diff --git a/tests/qtest/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-tes= t.c index afb702b565..60db81a3a2 100644 --- a/tests/qtest/pflash-cfi02-test.c +++ b/tests/qtest/pflash-cfi02-test.c @@ -261,7 +261,7 @@ static void test_geometry(const void *opaque) const FlashConfig *config =3D opaque; QTestState *qtest; qtest =3D qtest_initf("-M musicpal" - " -drive if=3Dpflash,file=3D%s,format=3Draw,copy-o= n-read" + " -drive if=3Dpflash,file=3D%s,format=3Draw,copy-o= n-read=3Don" /* Device geometry properties. */ " -global driver=3Dcfi.pflash02," "property=3Dnum-blocks0,value=3D%d" @@ -581,7 +581,7 @@ static void test_cfi_in_autoselect(const void *opaque) const FlashConfig *config =3D opaque; QTestState *qtest; qtest =3D qtest_initf("-M musicpal" - " -drive if=3Dpflash,file=3D%s,format=3Draw,copy-o= n-read", + " -drive if=3Dpflash,file=3D%s,format=3Draw,copy-o= n-read=3Don", image_path); FlashConfig explicit_config =3D expand_config_defaults(config); explicit_config.qtest =3D qtest; diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter= -redirector.c index 829db8c2ea..4269b2cdd9 100644 --- a/tests/qtest/test-filter-redirector.c +++ b/tests/qtest/test-filter-redirector.c @@ -95,8 +95,8 @@ static void test_redirector_tx(void) qts =3D qtest_initf( "-netdev socket,id=3Dqtest-bn0,fd=3D%d " "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " - "-chardev socket,id=3Dredirector0,path=3D%s,server,nowait " - "-chardev socket,id=3Dredirector1,path=3D%s,server,nowait " + "-chardev socket,id=3Dredirector0,path=3D%s,server=3Don,wait=3Doff= " + "-chardev socket,id=3Dredirector1,path=3D%s,server=3Don,wait=3Doff= " "-chardev socket,id=3Dredirector2,path=3D%s " "-object filter-redirector,id=3Dqtest-f0,netdev=3Dqtest-bn0," "queue=3Dtx,outdev=3Dredirector0 " @@ -165,8 +165,8 @@ static void test_redirector_rx(void) qts =3D qtest_initf( "-netdev socket,id=3Dqtest-bn0,fd=3D%d " "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " - "-chardev socket,id=3Dredirector0,path=3D%s,server,nowait " - "-chardev socket,id=3Dredirector1,path=3D%s,server,nowait " + "-chardev socket,id=3Dredirector0,path=3D%s,server=3Don,wait=3Doff= " + "-chardev socket,id=3Dredirector1,path=3D%s,server=3Don,wait=3Doff= " "-chardev socket,id=3Dredirector2,path=3D%s " "-object filter-redirector,id=3Dqtest-f0,netdev=3Dqtest-bn0," "queue=3Drx,indev=3Dredirector0 " diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index 3df5322614..1a5f5313ff 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -537,7 +537,7 @@ static void test_server_create_chr(TestServer *server, = const gchar *opt) =20 static void test_server_listen(TestServer *server) { - test_server_create_chr(server, ",server,nowait"); + test_server_create_chr(server, ",server=3Don,wait=3Doff"); } =20 static void test_server_free(TestServer *server) @@ -846,7 +846,7 @@ static void *vhost_user_test_setup_reconnect(GString *c= md_line, void *arg) =20 g_thread_new("connect", connect_thread, s); append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); - s->vu_ops->append_opts(s, cmd_line, ",server"); + s->vu_ops->append_opts(s, cmd_line, ",server=3Don"); =20 g_test_queue_destroy(vhost_user_test_cleanup, s); =20 @@ -883,7 +883,7 @@ static void *vhost_user_test_setup_connect_fail(GString= *cmd_line, void *arg) =20 g_thread_new("connect", connect_thread, s); append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); - s->vu_ops->append_opts(s, cmd_line, ",server"); + s->vu_ops->append_opts(s, cmd_line, ",server=3Don"); =20 g_test_queue_destroy(vhost_user_test_cleanup, s); =20 @@ -898,7 +898,7 @@ static void *vhost_user_test_setup_flags_mismatch(GStri= ng *cmd_line, void *arg) =20 g_thread_new("connect", connect_thread, s); append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); - s->vu_ops->append_opts(s, cmd_line, ",server"); + s->vu_ops->append_opts(s, cmd_line, ",server=3Don"); =20 g_test_queue_destroy(vhost_user_test_cleanup, s); =20 diff --git a/tests/test-char.c b/tests/test-char.c index 9196e566e9..953e0d1c1f 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -413,7 +413,7 @@ static void char_websock_test(void) CharBackend client_be; Chardev *chr_client; Chardev *chr =3D qemu_chr_new("server", - "websocket:127.0.0.1:0,server,nowait", NUL= L); + "websocket:127.0.0.1:0,server=3Don,wait=3D= off", NULL); const char handshake[] =3D "GET / HTTP/1.1\r\n" "Upgrade: websocket\r\n" "Connection: Upgrade\r\n" @@ -696,7 +696,7 @@ char_socket_addr_to_opt_str(SocketAddress *addr, bool f= d_pass, fd =3D ioc->fd; ioc->fd =3D -1; optstr =3D g_strdup_printf("socket,id=3Dcdev0,fd=3D%d%s", - fd, is_listen ? ",server,nowait" : ""); + fd, is_listen ? ",server=3Don,wait=3Doff"= : ""); object_unref(OBJECT(ioc)); return optstr; } else { @@ -706,13 +706,13 @@ char_socket_addr_to_opt_str(SocketAddress *addr, bool= fd_pass, addr->u.inet.host, addr->u.inet.port, reconnect ? reconnect : "", - is_listen ? ",server,nowait" : ""); + is_listen ? ",server=3Don,wait=3Doff" := ""); =20 case SOCKET_ADDRESS_TYPE_UNIX: return g_strdup_printf("socket,id=3Dcdev0,path=3D%s%s%s", addr->u.q_unix.path, reconnect ? reconnect : "", - is_listen ? ",server,nowait" : ""); + is_listen ? ",server=3Don,wait=3Doff" := ""); =20 default: g_assert_not_reached(); --=20 2.26.2