From nobody Tue Nov 18 22:46:02 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
ARC-Seal: i=1; a=rsa-sha256; t=1613496417; cv=none;
	d=zohomail.com; s=zohoarc;
	b=lqJwYyQ4oeUZ0FWR/uLHjxgmHWTNU6qWYpQqumdEUnUY6yFYGxXVlrrwUadeqVijM9RuqtTOaFFq/kj2NRJHPf3hnTtgbNiqCgum6xi7TSIXOkuKYz7UOmLCbOXzfsYrMfwPuiscne4PNTmD3mDCI/mDVaeeBXO4gMpJ78Ok7x4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1613496417;
 h=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=ms7vxDT7MkgIcKOYZfST+aJKTL4hnw/oQ4N4Qyq5OEk=;
	b=moSJJc3YctZvW7d7Pe97GMtOnAmF7GZVEpW/bH4eq/Dm99IZoOBtBtUpZ7bbJJ+Q56Wchnqbbfn3JFp+SkweBUR3v2t7lkwHhSkWAturFuXM5ZX1d41vb6HNJtpKcryWnSlLstISPZ0iCW2ijurz7YL3t6606FNsxTa/dReEN+k=
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
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1613496417361572.1130264007379;
 Tue, 16 Feb 2021 09:26:57 -0800 (PST)
Received: from localhost ([::1]:36332 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1lC47k-0002aP-92
	for importer@patchew.org; Tue, 16 Feb 2021 12:26:56 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:40266)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <berto@igalia.com>)
 id 1lC3yQ-0000Wk-5c; Tue, 16 Feb 2021 12:17:18 -0500
Received: from fanzine.igalia.com ([178.60.130.6]:33688)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <berto@igalia.com>)
 id 1lC3yM-0005MK-At; Tue, 16 Feb 2021 12:17:17 -0500
Received: from [213.94.25.37] (helo=perseus.local)
 by fanzine.igalia.com with esmtpsa
 (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim)
 id 1lC3yJ-000099-4N; Tue, 16 Feb 2021 18:17:11 +0100
Received: from berto by perseus.local with local (Exim 4.92)
 (envelope-from <berto@igalia.com>)
 id 1lC3y5-0001iH-A7; Tue, 16 Feb 2021 18:16:57 +0100
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com;
 s=20170329;
 h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From;
 bh=ms7vxDT7MkgIcKOYZfST+aJKTL4hnw/oQ4N4Qyq5OEk=;
 b=mPbpp054jNHpq/NYCDUX0ON9e9aJNClj1XZ7ccNFnfYfs+9Xi3vTx/jZSVbHC6kA5QSgvO0gMzjTQZ49LHx3DsnTs91e+8rzwxlPzDlxUuhzpcOip7dLlsXkeWCt7M4cJuSO5xcR6mrHB/vxTfnHwOoM1Me3iAL+oHduFNbT2nmWhIMr8FGH29GKo19ZiXKIPb1zyQN0ujbxLVWyBRKiecvyC3VyrteWnRO3as4qQjRGej8JbKO+QvIiDNqmnPA4mBl16mA5Y18hcNHNAMKDp9PJ/x7U7A18kI38MjF7h22wtGITG5y7dvQxXBJZuPg7pEIkjvgxKk2blrdAhCarEg==;
From: Alberto Garcia <berto@igalia.com>
To: qemu-block@nongnu.org
Subject: [PATCH] iotests: Drop deprecated 'props' from object-add
Date: Tue, 16 Feb 2021 18:16:53 +0100
Message-Id: <20210216171653.6543-1-berto@igalia.com>
X-Mailer: git-send-email 2.20.1
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=178.60.130.6; envelope-from=berto@igalia.com;
 helo=fanzine.igalia.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, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
 qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/087     |  8 ++------
 tests/qemu-iotests/184     | 18 ++++++------------
 tests/qemu-iotests/218     |  2 +-
 tests/qemu-iotests/235     |  2 +-
 tests/qemu-iotests/245     |  4 ++--
 tests/qemu-iotests/258     |  7 +++----
 tests/qemu-iotests/258.out |  4 ++--
 tests/qemu-iotests/295     |  2 +-
 tests/qemu-iotests/296     |  2 +-
 9 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
index edd43f1a28..d8e0e384cd 100755
--- a/tests/qemu-iotests/087
+++ b/tests/qemu-iotests/087
@@ -143,9 +143,7 @@ run_qemu <<EOF
   "arguments": {
       "qom-type": "secret",
       "id": "sec0",
-      "props": {
-          "data": "123456"
-      }
+      "data": "123456"
   }
 }
 { "execute": "blockdev-add",
@@ -176,9 +174,7 @@ run_qemu <<EOF
   "arguments": {
       "qom-type": "secret",
       "id": "sec0",
-      "props": {
-          "data": "123456"
-      }
+      "data": "123456"
   }
 }
 { "execute": "blockdev-add",
diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184
index 513d167098..e4cbcd8634 100755
--- a/tests/qemu-iotests/184
+++ b/tests/qemu-iotests/184
@@ -67,10 +67,8 @@ run_qemu <<EOF
   "arguments": {
     "qom-type": "throttle-group",
     "id": "group0",
-    "props": {
-      "limits" : {
-        "iops-total": 1000
-      }
+    "limits" : {
+      "iops-total": 1000
     }
   }
 }
@@ -96,10 +94,8 @@ run_qemu <<EOF
   "arguments": {
     "qom-type": "throttle-group",
     "id": "group0",
-    "props" : {
-      "limits": {
-          "iops-total": 1000
-      }
+    "limits": {
+        "iops-total": 1000
     }
   }
 }
@@ -136,10 +132,8 @@ run_qemu <<EOF
   "arguments": {
     "qom-type": "throttle-group",
     "id": "group0",
-    "props" : {
-      "limits": {
-          "iops-total": 1000
-      }
+    "limits": {
+        "iops-total": 1000
     }
   }
 }
diff --git a/tests/qemu-iotests/218 b/tests/qemu-iotests/218
index ae7c4fb187..cbb38923cf 100755
--- a/tests/qemu-iotests/218
+++ b/tests/qemu-iotests/218
@@ -152,7 +152,7 @@ with iotests.VM() as vm, \
     vm.launch()
=20
     ret =3D vm.qmp('object-add', qom_type=3D'throttle-group', id=3D'tg',
-                 props=3D{'x-bps-read': 4096})
+                 x_bps_read =3D 4096)
     assert ret['return'] =3D=3D {}
=20
     ret =3D vm.qmp('blockdev-add',
diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index 20d16dbf38..f5c73b9c17 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235
@@ -57,7 +57,7 @@ vm.add_args('-drive', 'id=3Dsrc,file=3D' + disk)
 vm.launch()
=20
 log(vm.qmp('object-add', qom_type=3D'throttle-group', id=3D'tg0',
-           props=3D{ 'x-bps-total': size }))
+           x_bps_total=3Dsize))
=20
 log(vm.qmp('blockdev-add',
            **{ 'node-name': 'target',
diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
index cfdeb902be..30b1d7b22d 100755
--- a/tests/qemu-iotests/245
+++ b/tests/qemu-iotests/245
@@ -644,12 +644,12 @@ class TestBlockdevReopen(iotests.QMPTestCase):
         ###### throttle ######
         ######################
         opts =3D { 'qom-type': 'throttle-group', 'id': 'group0',
-                 'props': { 'limits': { 'iops-total': 1000 } } }
+                 'limits': { 'iops-total': 1000 } }
         result =3D self.vm.qmp('object-add', conv_keys =3D False, **opts)
         self.assert_qmp(result, 'return', {})
=20
         opts =3D { 'qom-type': 'throttle-group', 'id': 'group1',
-                 'props': { 'limits': { 'iops-total': 2000 } } }
+                 'limits': { 'iops-total': 2000 } }
         result =3D self.vm.qmp('object-add', conv_keys =3D False, **opts)
         self.assert_qmp(result, 'return', {})
=20
diff --git a/tests/qemu-iotests/258 b/tests/qemu-iotests/258
index 9a2d33ae5e..65ce02501a 100755
--- a/tests/qemu-iotests/258
+++ b/tests/qemu-iotests/258
@@ -103,10 +103,9 @@ def test_concurrent_finish(write_to_stream_node):
         vm.qmp_log('object-add',
                    qom_type=3D'throttle-group',
                    id=3D'tg',
-                   props=3D{
-                       'x-iops-write': 1,
-                       'x-iops-write-max': 1
-                   })
+                   x_iops_write=3D1,
+                   x_iops_write_max=3D1
+                   )
=20
         vm.qmp_log('blockdev-add',
                    filters=3D[filter_qmp_testfiles, filter_qmp_imgfmt],
diff --git a/tests/qemu-iotests/258.out b/tests/qemu-iotests/258.out
index ce6e9ba3e5..bfcaf97afe 100644
--- a/tests/qemu-iotests/258.out
+++ b/tests/qemu-iotests/258.out
@@ -2,7 +2,7 @@ Running tests:
=20
 =3D=3D=3D Commit and stream finish concurrently (letting stream write) =3D=
=3D=3D
=20
-{"execute": "object-add", "arguments": {"id": "tg", "props": {"x-iops-writ=
e": 1, "x-iops-write-max": 1}, "qom-type": "throttle-group"}}
+{"execute": "object-add", "arguments": {"id": "tg", "qom-type": "throttle-=
group", "x-iops-write": 1, "x-iops-write-max": 1}}
 {"return": {}}
 {"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing=
": {"backing": {"driver": "raw", "file": {"driver": "file", "filename": "TE=
ST_DIR/PID-node0.img"}, "node-name": "node0"}, "driver": "IMGFMT", "file": =
{"driver": "file", "filename": "TEST_DIR/PID-node1.img"}, "node-name": "nod=
e1"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/=
PID-node2.img"}, "node-name": "node2"}, "driver": "IMGFMT", "file": {"drive=
r": "file", "filename": "TEST_DIR/PID-node3.img"}, "node-name": "node3"}, "=
driver": "IMGFMT", "file": {"driver": "throttle", "file": {"driver": "file"=
, "filename": "TEST_DIR/PID-node4.img"}, "throttle-group": "tg"}, "node-nam=
e": "node4"}}
 {"return": {}}
@@ -18,7 +18,7 @@ Running tests:
=20
 =3D=3D=3D Commit and stream finish concurrently (letting commit write) =3D=
=3D=3D
=20
-{"execute": "object-add", "arguments": {"id": "tg", "props": {"x-iops-writ=
e": 1, "x-iops-write-max": 1}, "qom-type": "throttle-group"}}
+{"execute": "object-add", "arguments": {"id": "tg", "qom-type": "throttle-=
group", "x-iops-write": 1, "x-iops-write-max": 1}}
 {"return": {}}
 {"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing=
": {"backing": {"driver": "raw", "file": {"driver": "throttle", "file": {"d=
river": "file", "filename": "TEST_DIR/PID-node0.img"}, "throttle-group": "t=
g"}, "node-name": "node0"}, "driver": "IMGFMT", "file": {"driver": "file", =
"filename": "TEST_DIR/PID-node1.img"}, "node-name": "node1"}, "driver": "IM=
GFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node2.img"}, "n=
ode-name": "node2"}, "driver": "IMGFMT", "file": {"driver": "file", "filena=
me": "TEST_DIR/PID-node3.img"}, "node-name": "node3"}, "driver": "IMGFMT", =
"file": {"driver": "file", "filename": "TEST_DIR/PID-node4.img"}, "node-nam=
e": "node4"}}
 {"return": {}}
diff --git a/tests/qemu-iotests/295 b/tests/qemu-iotests/295
index 01a6c0b31f..270ad3999f 100755
--- a/tests/qemu-iotests/295
+++ b/tests/qemu-iotests/295
@@ -43,7 +43,7 @@ class Secret:
=20
     def to_qmp_object(self):
         return { "qom_type" : "secret", "id": self.id(),
-                 "props": { "data": self.secret() } }
+                 "data": self.secret() }
=20
 ##########################################################################=
######
 class EncryptionSetupTestCase(iotests.QMPTestCase):
diff --git a/tests/qemu-iotests/296 b/tests/qemu-iotests/296
index 0bc3c6c7d7..7c65e987a1 100755
--- a/tests/qemu-iotests/296
+++ b/tests/qemu-iotests/296
@@ -43,7 +43,7 @@ class Secret:
=20
     def to_qmp_object(self):
         return { "qom_type" : "secret", "id": self.id(),
-                 "props": { "data": self.secret() } }
+                 "data": self.secret() }
=20
 ##########################################################################=
######
=20
--=20
2.20.1