From nobody Mon Feb 9 15:28:34 2026 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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1696607058; cv=none; d=zohomail.com; s=zohoarc; b=Q4J0eTb1jtq0m9OBVHmZR5pLUG0rhKQUI2ARA4V0PG8943kUVARNIF+HQbQWXz8j5up1x78ZfAlr2ogFjKFBNSdR/gUVZrsOxrtC4iPJ/CVhIokrIxlT56ylLrarDwjOtsFPbkcoulEy3w0RYFhqwfUjMmKn9m00oXrg51t4poA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696607058; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LnIpgBWkDUQl3QshcR6oeCKmxsdf4rL+cQcHLbROP50=; b=Ab5ALxyR63Q5BToUpo9rH2/MyBdC/8UX75WTw8OKteQCUXTLG5J3LbErJDSmck6naHLDnFLrzx4LDHPEkKis2A0RFFPH3KliJ5zo5DJXJg4a4ylZmPgQqtY2p/dYFV/qj5qLdCCa9jcfBWWGJeD0Kr9dfnCLewoEL22/kn4REJY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696607058864863.1036486737357; Fri, 6 Oct 2023 08:44:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qomxz-0006gb-1f; Fri, 06 Oct 2023 11:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qomxv-0006ev-Ai; Fri, 06 Oct 2023 11:42:11 -0400 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qomxo-0003bL-L2; Fri, 06 Oct 2023 11:42:11 -0400 Received: from mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:3a8c:0:640:ec94:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTP id 87F3E61131; Fri, 6 Oct 2023 18:42:01 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6b8:b081:a512::1:22]) by mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id VfbK2W5OrKo0-a23YfkNY; Fri, 06 Oct 2023 18:42:00 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1696606920; bh=LnIpgBWkDUQl3QshcR6oeCKmxsdf4rL+cQcHLbROP50=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=m8+gdXCRrqaaylHI709tI12/f2AFa78Bb5CgiJsx/aTPJmSvkDxiOm2oQc9nbSJpv s128w/WrMzq0q5sba1XNITI+trabbaSqNPDqI4XLdaTHqTH1NOYkr0nBgqf85uk/LP En0rrruLg/PA9grj0elvLD7GOLX56sMIrgFfnD2c= Authentication-Results: mail-nwsmtp-smtp-corp-main-62.myt.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru, jsnow@redhat.com, crosa@redhat.com, kwolf@redhat.com, hreitz@redhat.com, eblake@redhat.com Subject: [PATCH v7 11/15] iotests: drop some extra ** in qmp() call Date: Fri, 6 Oct 2023 18:41:21 +0300 Message-Id: <20231006154125.1068348-12-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231006154125.1068348-1-vsementsov@yandex-team.ru> References: <20231006154125.1068348-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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=2a02:6b8:c02:900:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1696607059176100001 Content-Type: text/plain; charset="utf-8" qmp() method supports passing dict (if it doesn't need substituting '_' to '-' in keys). So, drop some extra '**' operators. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/040 | 4 +- tests/qemu-iotests/041 | 14 +++--- tests/qemu-iotests/129 | 2 +- tests/qemu-iotests/147 | 2 +- tests/qemu-iotests/155 | 2 +- tests/qemu-iotests/264 | 12 ++--- tests/qemu-iotests/295 | 5 +- tests/qemu-iotests/296 | 15 +++--- tests/qemu-iotests/tests/migrate-bitmaps-test | 4 +- .../tests/mirror-ready-cancel-error | 50 +++++++++---------- 10 files changed, 54 insertions(+), 56 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index e61e7f2433..4b8bf09a5d 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -774,7 +774,7 @@ class TestCommitWithFilters(iotests.QMPTestCase): result =3D self.vm.qmp('object-add', qom_type=3D'throttle-group', = id=3D'tg') self.assert_qmp(result, 'return', {}) =20 - result =3D self.vm.qmp('blockdev-add', **{ + result =3D self.vm.qmp('blockdev-add', { 'node-name': 'top-filter', 'driver': 'throttle', 'throttle-group': 'tg', @@ -935,7 +935,7 @@ class TestCommitWithOverriddenBacking(iotests.QMPTestCa= se): self.vm.launch() =20 # Use base_b instead of base_a as the backing of top - result =3D self.vm.qmp('blockdev-add', **{ + result =3D self.vm.qmp('blockdev-add', { 'node-name': 'top', 'driver': iotests.imgfmt, 'file': { diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 550e4dc391..3aef42aec8 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -236,7 +236,7 @@ class TestSingleBlockdev(TestSingleDrive): args =3D {'driver': iotests.imgfmt, 'node-name': self.qmp_target, 'file': { 'filename': target_img, 'driver': 'file' } } - result =3D self.vm.qmp("blockdev-add", **args) + result =3D self.vm.qmp("blockdev-add", args) self.assert_qmp(result, 'return', {}) =20 def test_mirror_to_self(self): @@ -963,7 +963,7 @@ class TestRepairQuorum(iotests.QMPTestCase): #assemble the quorum block device from the individual files args =3D { "driver": "quorum", "node-name": "quorum0", "vote-threshold": 2, "children": [ "img0", "img1", "img2"= ] } - result =3D self.vm.qmp("blockdev-add", **args) + result =3D self.vm.qmp("blockdev-add", args) self.assert_qmp(result, 'return', {}) =20 =20 @@ -1278,7 +1278,7 @@ class TestReplaces(iotests.QMPTestCase): """ Check that we can replace filter nodes. """ - result =3D self.vm.qmp('blockdev-add', **{ + result =3D self.vm.qmp('blockdev-add', { 'driver': 'copy-on-read', 'node-name': 'filter0', 'file': { @@ -1319,7 +1319,7 @@ class TestFilters(iotests.QMPTestCase): self.vm =3D iotests.VM().add_device('virtio-scsi,id=3Dvio-scsi') self.vm.launch() =20 - result =3D self.vm.qmp('blockdev-add', **{ + result =3D self.vm.qmp('blockdev-add', { 'node-name': 'target', 'driver': iotests.imgfmt, 'file': { @@ -1355,7 +1355,7 @@ class TestFilters(iotests.QMPTestCase): os.remove(backing_img) =20 def test_cor(self): - result =3D self.vm.qmp('blockdev-add', **{ + result =3D self.vm.qmp('blockdev-add', { 'node-name': 'filter', 'driver': 'copy-on-read', 'file': self.filterless_chain @@ -1384,7 +1384,7 @@ class TestFilters(iotests.QMPTestCase): assert target_map[1]['depth'] =3D=3D 0 =20 def test_implicit_mirror_filter(self): - result =3D self.vm.qmp('blockdev-add', **self.filterless_chain) + result =3D self.vm.qmp('blockdev-add', self.filterless_chain) self.assert_qmp(result, 'return', {}) =20 # We need this so we can query from above the mirror node @@ -1418,7 +1418,7 @@ class TestFilters(iotests.QMPTestCase): def test_explicit_mirror_filter(self): # Same test as above, but this time we give the mirror filter # a node-name so it will not be invisible - result =3D self.vm.qmp('blockdev-add', **self.filterless_chain) + result =3D self.vm.qmp('blockdev-add', self.filterless_chain) self.assert_qmp(result, 'return', {}) =20 # We need this so we can query from above the mirror node diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129 index c75ec62ecf..e1536ee3c3 100755 --- a/tests/qemu-iotests/129 +++ b/tests/qemu-iotests/129 @@ -87,7 +87,7 @@ class TestStopWithBlockJob(iotests.QMPTestCase): iotests.qemu_img('create', '-f', iotests.imgfmt, self.overlay_img, '1G') =20 - result =3D self.vm.qmp('blockdev-add', **{ + result =3D self.vm.qmp('blockdev-add', { 'node-name': 'overlay', 'driver': iotests.imgfmt, 'file': { diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 770b73e2f4..08111c5108 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -58,7 +58,7 @@ class NBDBlockdevAddBase(iotests.QMPTestCase): def client_test(self, filename, address, export=3DNone, node_name=3D'nbd-blockdev', delete=3DTrue): bao =3D self.blockdev_add_options(address, export, node_name) - result =3D self.vm.qmp('blockdev-add', **bao) + result =3D self.vm.qmp('blockdev-add', bao) self.assert_qmp(result, 'return', {}) =20 found =3D False diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155 index d3e1b7401e..0c073fd61b 100755 --- a/tests/qemu-iotests/155 +++ b/tests/qemu-iotests/155 @@ -110,7 +110,7 @@ class BaseClass(iotests.QMPTestCase): elif self.target_blockdev_backing: options['backing'] =3D self.target_blockdev_backing =20 - result =3D self.vm.qmp('blockdev-add', **options) + result =3D self.vm.qmp('blockdev-add', options) self.assert_qmp(result, 'return', {}) =20 def tearDown(self): diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index 289381e315..d44deb673a 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -49,12 +49,12 @@ class TestNbdReconnect(iotests.QMPTestCase): assert job in ('blockdev-backup', 'blockdev-mirror') with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): result =3D self.vm.qmp('blockdev-add', - **{'node_name': 'backup0', - 'driver': 'raw', - 'file': {'driver': 'nbd', - 'server': {'type': 'unix', - 'path': nbd_sock}, - 'reconnect-delay': 10}}) + {'node-name': 'backup0', + 'driver': 'raw', + 'file': {'driver': 'nbd', + 'server': {'type': 'unix', + 'path': nbd_sock}, + 'reconnect-delay': 10}}) self.assert_qmp(result, 'return', {}) result =3D self.vm.qmp(job, device=3D'drive0', sync=3D'full', target=3D'backup0', diff --git a/tests/qemu-iotests/295 b/tests/qemu-iotests/295 index 270ad3999f..8ebe31054c 100755 --- a/tests/qemu-iotests/295 +++ b/tests/qemu-iotests/295 @@ -102,8 +102,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase): } } =20 - result =3D self.vm.qmp('blockdev-add', ** - { + result =3D self.vm.qmp('blockdev-add', { 'driver': iotests.imgfmt, 'node-name': id, 'read-only': read_only, @@ -120,7 +119,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase): =20 # close the encrypted block device def closeImageQmp(self, id): - result =3D self.vm.qmp('blockdev-del', **{ 'node-name': id }) + result =3D self.vm.qmp('blockdev-del', {'node-name': id}) self.assert_qmp(result, 'return', {}) =20 ######################################################################= ##### diff --git a/tests/qemu-iotests/296 b/tests/qemu-iotests/296 index 19a674c5ae..47d2526b72 100755 --- a/tests/qemu-iotests/296 +++ b/tests/qemu-iotests/296 @@ -42,7 +42,7 @@ class Secret: return [ "secret,id=3D" + self._id + ",data=3D" + self._secret] =20 def to_qmp_object(self): - return { "qom_type" : "secret", "id": self.id(), + return { "qom-type" : "secret", "id": self.id(), "data": self.secret() } =20 ##########################################################################= ###### @@ -61,9 +61,9 @@ class EncryptionSetupTestCase(iotests.QMPTestCase): # create the secrets and load 'em into the VMs self.secrets =3D [ Secret(i) for i in range(0, 4) ] for secret in self.secrets: - result =3D self.vm1.qmp("object-add", **secret.to_qmp_object()) + result =3D self.vm1.qmp("object-add", secret.to_qmp_object()) self.assert_qmp(result, 'return', {}) - result =3D self.vm2.qmp("object-add", **secret.to_qmp_object()) + result =3D self.vm2.qmp("object-add", secret.to_qmp_object()) self.assert_qmp(result, 'return', {}) =20 # test case shutdown @@ -135,15 +135,14 @@ class EncryptionSetupTestCase(iotests.QMPTestCase): result =3D vm.qmp(command, options=3D[opts]) self.assert_qmp(result, 'return', {}) else: - result =3D vm.qmp(command, **opts) + result =3D vm.qmp(command, opts) self.assert_qmp(result, 'return', {}) =20 =20 ######################################################################= ##### # add virtio-blk consumer for a block device def addImageUser(self, vm, id, disk_id, share_rw=3DFalse): - result =3D vm.qmp('device_add', ** - { + result =3D vm.qmp('device_add', { 'driver': 'virtio-blk', 'id': id, 'drive': disk_id, @@ -155,7 +154,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase): =20 # close the encrypted block device def closeImageQmp(self, vm, id): - result =3D vm.qmp('blockdev-del', **{ 'node-name': id }) + result =3D vm.qmp('blockdev-del', {'node-name': id}) self.assert_qmp(result, 'return', {}) =20 ######################################################################= ##### @@ -174,7 +173,7 @@ class EncryptionSetupTestCase(iotests.QMPTestCase): }, } =20 - result =3D vm.qmp('x-blockdev-amend', **args) + result =3D vm.qmp('x-blockdev-amend', args) iotests.log(result) # Run the job only if it was created event =3D ('JOB_STATUS_CHANGE', diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-test b/tests/qemu-iot= ests/tests/migrate-bitmaps-test index 8668caae1e..eebb256485 100755 --- a/tests/qemu-iotests/tests/migrate-bitmaps-test +++ b/tests/qemu-iotests/tests/migrate-bitmaps-test @@ -67,7 +67,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): if persistent: params['persistent'] =3D True =20 - result =3D vm.qmp('block-dirty-bitmap-add', **params) + result =3D vm.qmp('block-dirty-bitmap-add', params) self.assert_qmp(result, 'return', {}) =20 def check_bitmap(self, vm, sha256): @@ -256,7 +256,7 @@ class TestDirtyBitmapBackingMigration(iotests.QMPTestCa= se): self.vm =3D iotests.VM() self.vm.launch() =20 - result =3D self.vm.qmp('blockdev-add', **blockdev) + result =3D self.vm.qmp('blockdev-add', blockdev) self.assert_qmp(result, 'return', {}) =20 # Check that the bitmaps are there diff --git a/tests/qemu-iotests/tests/mirror-ready-cancel-error b/tests/qem= u-iotests/tests/mirror-ready-cancel-error index 01217459b9..a59e245659 100755 --- a/tests/qemu-iotests/tests/mirror-ready-cancel-error +++ b/tests/qemu-iotests/tests/mirror-ready-cancel-error @@ -49,12 +49,12 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase): =20 def add_blockdevs(self, once: bool) -> None: res =3D self.vm.qmp('blockdev-add', - **{'node-name': 'source', - 'driver': iotests.imgfmt, - 'file': { - 'driver': 'file', - 'filename': source - }}) + {'node-name': 'source', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': source + }}) self.assert_qmp(res, 'return', {}) =20 # blkdebug notes: @@ -63,25 +63,25 @@ class TestMirrorReadyCancelError(iotests.QMPTestCase): # when the job is about to complete, and we want that one to # fail. res =3D self.vm.qmp('blockdev-add', - **{'node-name': 'target', - 'driver': iotests.imgfmt, - 'file': { - 'driver': 'blkdebug', - 'image': { - 'driver': 'file', - 'filename': target - }, - 'set-state': [{ - 'event': 'flush_to_disk', - 'state': 1, - 'new_state': 2 - }], - 'inject-error': [{ - 'event': 'flush_to_disk', - 'once': once, - 'immediately': True, - 'state': 2 - }]}}) + {'node-name': 'target', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'blkdebug', + 'image': { + 'driver': 'file', + 'filename': target + }, + 'set-state': [{ + 'event': 'flush_to_disk', + 'state': 1, + 'new_state': 2 + }], + 'inject-error': [{ + 'event': 'flush_to_disk', + 'once': once, + 'immediately': True, + 'state': 2 + }]}}) self.assert_qmp(res, 'return', {}) =20 def start_mirror(self) -> None: --=20 2.34.1