From nobody Tue Mar 19 02:08:16 2024 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=1605886944; cv=none; d=zohomail.com; s=zohoarc; b=isAmvfQQZcFrxwBDD4WvwA4PEh/Gamc5qds49QtvSg+47uUjs9jCsRiYurXJyPmekRxYwr1+AbUZhiODeJqdQFkZgvzXrv5mWNCM//JxMSAWStmp4VNfWf9gyPtpnmsiaT3JdapiwtSZcTTuaVJamwcd7EPTR5y339K/mpMfqh4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605886944; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=OYOx7x0ULV0XD2JV3FikoVg/IzAiHk7x1eiNdi3h6Uo=; b=SmxlRkJxcnwrT5Pa0UfZ8hvfRAYvx/FCjd0wrmLDg6BiND0nd/U+KE/NONW4QySb9syDq1UB61sprnXNF/gypKHhZI6GVdpMTxlk3LJP1W5GNt0w0xPg9d5gr9OtNaAK7lIBG9AG2kDi7qw6Su4aODJJb0hlSMK5LMqZXnzrmTc= 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 1605886944341223.57555080334282; Fri, 20 Nov 2020 07:42:24 -0800 (PST) Received: from localhost ([::1]:40998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg8YI-00048F-Hs for importer@patchew.org; Fri, 20 Nov 2020 10:42:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg8X0-0003dN-0Q for qemu-devel@nongnu.org; Fri, 20 Nov 2020 10:41:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kg8Wx-0000og-Ba for qemu-devel@nongnu.org; Fri, 20 Nov 2020 10:41:01 -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-504-QESmMXX7MjKEvhOMs5uCVA-1; Fri, 20 Nov 2020 10:40:52 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED99E80ED8B for ; Fri, 20 Nov 2020 15:40:51 +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 9F44760853; Fri, 20 Nov 2020 15:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605886857; 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; bh=OYOx7x0ULV0XD2JV3FikoVg/IzAiHk7x1eiNdi3h6Uo=; b=WpB02vQKn1s2XyWa++oaYu6dsi3i+m0wAgMDeY64mx2rs48QxlKg/pjeVUo6a2ip5Y7vbg SANcdZZ8all+oIRCQuKW5V/PF0nrH1qfR7rrG4sRclIy2UEOWbQOzKg7jG3ITKB7+DIJWg YmVeMjZwCKCpmp7uk1+1gHv8Z8SFCew= X-MC-Unique: QESmMXX7MjKEvhOMs5uCVA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2] python, tests: do not use short-form boolean options Date: Fri, 20 Nov 2020 10:40:51 -0500 Message-Id: <20201120154051.2495221-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: , Cc: armbru@redhat.com 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 Acked-by: John Snow --- python/qemu/machine.py | 2 +- 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 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 6420f01bed..6216530b0d 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/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