From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1548255310336697.7338380147215; Wed, 23 Jan 2019 06:55:10 -0800 (PST) Received: from localhost ([127.0.0.1]:36168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJvp-0005yg-7V for importer@patchew.org; Wed, 23 Jan 2019 09:55:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJnc-00089z-UH for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJnb-0000BY-9f for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJnR-0008Vo-Di; Wed, 23 Jan 2019 09:46:30 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E07E89AD5; Wed, 23 Jan 2019 14:46:23 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDF491EB; Wed, 23 Jan 2019 14:46:16 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:02 +0100 Message-Id: <20190123144610.8842-2-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 23 Jan 2019 14:46:23 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/9] iotests: Re-add filename filters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" A previous commit removed the default filters for qmp_log with the intention to make them explicit; but this happened only for test 206. There are more tests (for more exotic image formats than qcow2) which require the filename filter, though. Fixes: f8ca8609d8549def45b28e82ecac64adaeee9f12 Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/210 | 5 +++-- tests/qemu-iotests/211 | 5 +++-- tests/qemu-iotests/212 | 5 +++-- tests/qemu-iotests/213 | 5 +++-- tests/qemu-iotests/237 | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210 index d142841e2b..565e3b7b9b 100755 --- a/tests/qemu-iotests/210 +++ b/tests/qemu-iotests/210 @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=3D['luks']) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -53,7 +54,7 @@ with iotests.FilePath('t.luks') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_testfi= les]) =20 blockdev_create(vm, { 'driver': imgfmt, 'file': 'imgfile', diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211 index 7b7985db6c..5d285450b5 100755 --- a/tests/qemu-iotests/211 +++ b/tests/qemu-iotests/211 @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=3D['vdi']) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -51,7 +52,7 @@ with iotests.FilePath('t.vdi') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_testfi= les]) =20 blockdev_create(vm, { 'driver': imgfmt, 'file': 'imgfile', diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212 index 95c8810d83..42b74f208b 100755 --- a/tests/qemu-iotests/212 +++ b/tests/qemu-iotests/212 @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=3D['parallels'= ]) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -51,7 +52,7 @@ with iotests.FilePath('t.parallels') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_testfi= les]) =20 blockdev_create(vm, { 'driver': imgfmt, 'file': 'imgfile', diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213 index 4054439e3c..5604f3cebb 100755 --- a/tests/qemu-iotests/213 +++ b/tests/qemu-iotests/213 @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=3D['vhdx']) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -51,7 +52,7 @@ with iotests.FilePath('t.vhdx') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_testfi= les]) =20 blockdev_create(vm, { 'driver': imgfmt, 'file': 'imgfile', diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237 index 251771d7fb..fe0dd0f461 100755 --- a/tests/qemu-iotests/237 +++ b/tests/qemu-iotests/237 @@ -27,7 +27,8 @@ from iotests import imgfmt iotests.verify_image_format(supported_fmts=3D['vmdk']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -54,7 +55,7 @@ with iotests.FilePath('t.vmdk') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_testfi= les]) =20 blockdev_create(vm, { 'driver': imgfmt, 'file': 'imgfile', --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1548255049989785.7956822627158; Wed, 23 Jan 2019 06:50:49 -0800 (PST) Received: from localhost ([127.0.0.1]:36120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJrd-0002gR-1M for importer@patchew.org; Wed, 23 Jan 2019 09:50:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJnc-00089B-9C for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJnb-0000Be-BA for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJnW-00005v-K7; Wed, 23 Jan 2019 09:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8AD64C057E22; Wed, 23 Jan 2019 14:46:27 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DFC0E1816A; Wed, 23 Jan 2019 14:46:24 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:03 +0100 Message-Id: <20190123144610.8842-3-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 23 Jan 2019 14:46:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/9] iotests: Remove superfluous rm from 232 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This test creates no such file. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: John Snow --- tests/qemu-iotests/232 | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232 index 0708b8b155..93e5d641a3 100755 --- a/tests/qemu-iotests/232 +++ b/tests/qemu-iotests/232 @@ -29,7 +29,6 @@ status=3D1 # failure is the default! _cleanup() { _cleanup_test_img - rm -f $TEST_IMG.snap } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1548255654769126.81090485192999; Wed, 23 Jan 2019 07:00:54 -0800 (PST) Received: from localhost ([127.0.0.1]:36304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmK1N-0002Ew-MS for importer@patchew.org; Wed, 23 Jan 2019 10:00:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJnm-0008GJ-0f for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJni-0000Fw-Cz for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33512) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJnb-00006r-Ai; Wed, 23 Jan 2019 09:46:40 -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 mx1.redhat.com (Postfix) with ESMTPS id 07B1C7F3E7; Wed, 23 Jan 2019 14:46:30 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7BC5567140; Wed, 23 Jan 2019 14:46:29 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:04 +0100 Message-Id: <20190123144610.8842-4-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 23 Jan 2019 14:46:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/9] iotests: Fix 232 for LUKS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" With IMGOPTSSYNTAX, $TEST_IMG is useless for this test (it only tests the file-posix protocol driver). Therefore, if $TEST_IMG_FILE is set, use that instead. Because this test requires the file protocol, $TEST_IMG_FILE will always be set if $IMGOPTSSYNTAX is true. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/232 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232 index 93e5d641a3..e48bc8f5db 100755 --- a/tests/qemu-iotests/232 +++ b/tests/qemu-iotests/232 @@ -69,6 +69,10 @@ size=3D128M =20 _make_test_img $size =20 +if [ -n "$TEST_IMG_FILE" ]; then + TEST_IMG=3D$TEST_IMG_FILE +fi + echo echo "=3D=3D=3D -drive with read-write image: read-only/auto-read-only com= binations =3D=3D=3D" echo --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548255265517513.536082864462; Wed, 23 Jan 2019 06:54:25 -0800 (PST) Received: from localhost ([127.0.0.1]:36162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJv1-0005Hj-GN for importer@patchew.org; Wed, 23 Jan 2019 09:54:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJni-0008Fo-Ph for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJne-0000Dz-5M for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJna-00007p-Ca; Wed, 23 Jan 2019 09:46:39 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B84B89ACD; Wed, 23 Jan 2019 14:46:32 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE5E719743; Wed, 23 Jan 2019 14:46:31 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:05 +0100 Message-Id: <20190123144610.8842-5-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 23 Jan 2019 14:46:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/9] iotests: Fix 207 to use QMP filters for qmp_log X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Fixes: 08fcd6111e1949f456e1b232ebeeb0cc17019a92 Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/207 | 10 +++++++--- tests/qemu-iotests/207.out | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207 index c617ee7453..dfd3c51bd1 100755 --- a/tests/qemu-iotests/207 +++ b/tests/qemu-iotests/207 @@ -27,12 +27,16 @@ import re iotests.verify_image_format(supported_fmts=3D['raw']) iotests.verify_protocol(supported=3D['ssh']) =20 -def filter_hash(msg): - return re.sub('"hash": "[0-9a-f]+"', '"hash": HASH', msg) +def filter_hash(qmsg): + def _filter(key, value): + if key =3D=3D 'hash' and re.match('[0-9a-f]+', value): + return 'HASH' + return value + return iotests.filter_qmp(qmsg, _filter) =20 def blockdev_create(vm, options): result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions, - filters=3D[iotests.filter_testfiles, filter_hash]) + filters=3D[iotests.filter_qmp_testfiles, filter_ha= sh]) =20 if 'return' in result: assert result['return'] =3D=3D {} diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out index 45ac7c2a8f..88d2240f54 100644 --- a/tests/qemu-iotests/207.out +++ b/tests/qemu-iotests/207.out @@ -40,7 +40,7 @@ Job failed: remote host key does not match host_key_check= 'wrong' {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": HASH, "mode": "ha= sh", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.= 0.0.1", "port": "22"}}, "size": 8388608}}} +{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "HASH", "mode": "= hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "12= 7.0.0.1", "port": "22"}}, "size": 8388608}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -55,7 +55,7 @@ Job failed: remote host key does not match host_key_check= 'wrong' {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": HASH, "mode": "ha= sh", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127= .0.0.1", "port": "22"}}, "size": 4194304}}} +{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "HASH", "mode": "= hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "1= 27.0.0.1", "port": "22"}}, "size": 4194304}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1548255553864505.88486969164626; Wed, 23 Jan 2019 06:59:13 -0800 (PST) Received: from localhost ([127.0.0.1]:36241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJzk-0000m8-SF for importer@patchew.org; Wed, 23 Jan 2019 09:59:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJni-0008Fp-Pd for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJne-0000Ds-4G for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36304) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJnZ-00009J-NA; Wed, 23 Jan 2019 09:46:38 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2EDA8B139; Wed, 23 Jan 2019 14:46:36 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4437E5D6A6; Wed, 23 Jan 2019 14:46:34 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:06 +0100 Message-Id: <20190123144610.8842-6-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 23 Jan 2019 14:46:36 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/9] iotests: Fix 237 for Python 2.x X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" It is not quite clear whether we want to support Python 2.x for any prolonged time, but this may as well be fixed along with the other issues some iotests have right now. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/237 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237 index fe0dd0f461..06897f8c87 100755 --- a/tests/qemu-iotests/237 +++ b/tests/qemu-iotests/237 @@ -224,7 +224,7 @@ with iotests.FilePath('t.vmdk') as disk_path, \ iotests.log("=3D %s %d =3D" % (subfmt, size)) iotests.log("") =20 - num_extents =3D math.ceil(size / 2.0**31) + num_extents =3D int(math.ceil(size / 2.0**31)) extents =3D [ "ext%d" % (i) for i in range(1, num_extents + 1)= ] =20 vm.launch() --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 154825582627625.06551047698838; Wed, 23 Jan 2019 07:03:46 -0800 (PST) Received: from localhost ([127.0.0.1]:36337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmK48-0004A2-S3 for importer@patchew.org; Wed, 23 Jan 2019 10:03:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJo6-00005m-3s for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJo0-0000PB-29 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJnk-0000EU-Mx; Wed, 23 Jan 2019 09:46:48 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3E45EC71B8; Wed, 23 Jan 2019 14:46:43 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A77231EB; Wed, 23 Jan 2019 14:46:38 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:07 +0100 Message-Id: <20190123144610.8842-7-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 23 Jan 2019 14:46:43 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/9] iotests.py: Add is_str() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Strings can have various representations, this helper function checks whether a given value is in any of them. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/iotests.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index f51456fa63..29e4e3306f 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -221,6 +221,12 @@ def image_size(img): r =3D qemu_img_pipe('info', '--output=3Djson', '-f', imgfmt, img) return json.loads(r)['virtual-size'] =20 +def is_str(val): + if sys.version_info.major >=3D 3: + return isinstance(val, str) or isinstance(val, bytes) + else: + return isinstance(val, str) or isinstance(val, unicode) + test_dir_re =3D re.compile(r"%s" % test_dir) def filter_test_dir(msg): return test_dir_re.sub("TEST_DIR", msg) --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1548255445510456.4394121180603; Wed, 23 Jan 2019 06:57:25 -0800 (PST) Received: from localhost ([127.0.0.1]:36221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJxz-0007kV-0B for importer@patchew.org; Wed, 23 Jan 2019 09:57:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJoF-0000EO-1t for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJoA-0000bw-RU for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37358) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJo6-0000HK-LP; Wed, 23 Jan 2019 09:47:10 -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 mx1.redhat.com (Postfix) with ESMTPS id E65DA80F75; Wed, 23 Jan 2019 14:46:47 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 190635C224; Wed, 23 Jan 2019 14:46:44 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:08 +0100 Message-Id: <20190123144610.8842-8-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 23 Jan 2019 14:46:47 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 7/9] iotests.py: Filter filename in any string value X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" filter_qmp_testfiles() currently filters the filename only for specific keys. However, there are more keys that take filenames (such as block-commit's @top and @base, or ssh's @path), and it does not make sense to list them all here. "$TEST_DIR/$PID-" should have enough entropy not to appear anywhere randomly. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/iotests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 29e4e3306f..b6cb73e108 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -274,7 +274,7 @@ def filter_testfiles(msg): =20 def filter_qmp_testfiles(qmsg): def _filter(key, value): - if key =3D=3D 'filename' or key =3D=3D 'backing-file': + if is_str(value): return filter_testfiles(value) return value return filter_qmp(qmsg, _filter) --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1548255722583613.181744292637; Wed, 23 Jan 2019 07:02:02 -0800 (PST) Received: from localhost ([127.0.0.1]:36315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmK2T-0003BU-Ho for importer@patchew.org; Wed, 23 Jan 2019 10:02:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJoA-0000Aa-TL for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJo9-0000bD-7o for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33694) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJo6-0000Ic-8O; Wed, 23 Jan 2019 09:47:10 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F42E7F6C5; Wed, 23 Jan 2019 14:46:50 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA6195D6A6; Wed, 23 Jan 2019 14:46:49 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:09 +0100 Message-Id: <20190123144610.8842-9-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 23 Jan 2019 14:46:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 8/9] iotests: Filter SSH paths X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 8908b253c4ad5f8874c8d13abec169c696a5cd32 has implemented filtering of remote paths for NFS, but forgot SSH. This patch takes care of that. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/common.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index e15e7a7c8e..09a27f02d0 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -145,6 +145,7 @@ else TEST_IMG=3D"nbd:127.0.0.1:10810" elif [ "$IMGPROTO" =3D "ssh" ]; then TEST_IMG_FILE=3D$TEST_DIR/t.$IMGFMT + REMOTE_TEST_DIR=3D"ssh://127.0.0.1$TEST_DIR" TEST_IMG=3D"ssh://127.0.0.1$TEST_IMG_FILE" elif [ "$IMGPROTO" =3D "nfs" ]; then TEST_IMG_FILE=3D$TEST_DIR/t.$IMGFMT --=20 2.20.1 From nobody Fri Nov 7 11:21:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1548255286723582.1868059624394; Wed, 23 Jan 2019 06:54:46 -0800 (PST) Received: from localhost ([127.0.0.1]:36164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJvR-0005dk-9Q for importer@patchew.org; Wed, 23 Jan 2019 09:54:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJog-0000Yr-C9 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJoR-0000tN-UX for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:47:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41248) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJo7-0000Lq-1U; Wed, 23 Jan 2019 09:47:11 -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 mx1.redhat.com (Postfix) with ESMTPS id 03BD258E23; Wed, 23 Jan 2019 14:46:56 +0000 (UTC) Received: from localhost (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 39A046B8FB; Wed, 23 Jan 2019 14:46:52 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 23 Jan 2019 15:46:10 +0100 Message-Id: <20190123144610.8842-10-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 23 Jan 2019 14:46:56 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 9/9] iotests.py: s/_/-/g on keys in qmp_log() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This follows what qmp() does, so the output will correspond to the actual QMP command. Signed-off-by: Max Reitz --- tests/qemu-iotests/206.out | 56 +++++++++++++++++------------------ tests/qemu-iotests/207.out | 18 +++++------ tests/qemu-iotests/210.out | 28 +++++++++--------- tests/qemu-iotests/211.out | 26 ++++++++-------- tests/qemu-iotests/212.out | 44 +++++++++++++-------------- tests/qemu-iotests/213.out | 46 ++++++++++++++-------------- tests/qemu-iotests/237.out | 54 ++++++++++++++++----------------- tests/qemu-iotests/iotests.py | 6 ++-- 8 files changed, 140 insertions(+), 138 deletions(-) diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out index 91f4db55d3..0f1c23babb 100644 --- a/tests/qemu-iotests/206.out +++ b/tests/qemu-iotests/206.out @@ -1,13 +1,13 @@ =3D=3D=3D Successful image creation (defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.qcow2", "node_name": "imgfile"}} +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.qcow2", "node-name": "imgfile"}} {"return": {}} -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "imgfile", "size": 134217728}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "imgfile", "size": 134217728}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -24,12 +24,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (inline blockdev-add, explicit default= s) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "nocow": false, "pre= allocation": "off", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "nocow": false, "pre= allocation": "off", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 65536, "driver": "qcow2", "file": {"driver": "file", "file= name": "TEST_DIR/PID-t.qcow2"}, "lazy-refcounts": false, "preallocation": "= off", "refcount-bits": 16, "size": 67108864, "version": "v3"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 65536, "driver": "qcow2", "file": {"driver": "file", "file= name": "TEST_DIR/PID-t.qcow2"}, "lazy-refcounts": false, "preallocation": "= off", "refcount-bits": 16, "size": 67108864, "version": "v3"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -46,12 +46,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (v3 non-default options) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "nocow": true, "prea= llocation": "falloc", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "nocow": true, "prea= llocation": "falloc", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 2097152, "driver": "qcow2", "file": {"driver": "file", "fi= lename": "TEST_DIR/PID-t.qcow2"}, "lazy-refcounts": true, "preallocation": = "metadata", "refcount-bits": 1, "size": 33554432, "version": "v3"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 2097152, "driver": "qcow2", "file": {"driver": "file", "fi= lename": "TEST_DIR/PID-t.qcow2"}, "lazy-refcounts": true, "preallocation": = "metadata", "refcount-bits": 1, "size": 33554432, "version": "v3"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -68,12 +68,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (v2 non-default options) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"backing-file": "TEST_DIR/PID-t.qcow2.base", "backing-fmt": "qcow2", "clus= ter-size": 512, "driver": "qcow2", "file": {"driver": "file", "filename": "= TEST_DIR/PID-t.qcow2"}, "size": 33554432, "version": "v2"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"backing-file": "TEST_DIR/PID-t.qcow2.base", "backing-fmt": "qcow2", "clus= ter-size": 512, "driver": "qcow2", "file": {"driver": "file", "filename": "= TEST_DIR/PID-t.qcow2"}, "size": 33554432, "version": "v2"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -90,7 +90,7 @@ Format specific information: =20 =3D=3D=3D Successful image creation (encrypted) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "encrypt": {"cipher-alg": "twofish-128", "cipher-mode":= "ctr", "format": "luks", "hash-alg": "sha1", "iter-time": 10, "ivgen-alg":= "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0"}, "file": {"dr= iver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "encrypt": {"cipher-alg": "twofish-128", "cipher-mode":= "ctr", "format": "luks", "hash-alg": "sha1", "iter-time": 10, "ivgen-alg":= "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0"}, "file": {"dr= iver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -144,111 +144,111 @@ Format specific information: =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "this doesn't exist", "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "this doesn't exist", "size": 33554432}}} {"return": {}} Job failed: Cannot find device=3Dthis doesn't exist nor node_name=3Dthis d= oesn't exist {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 =3D=3D=3D Invalid sizes =3D=3D=3D -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 1234}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 1234}}} {"return": {}} Job failed: Image size must be a multiple of 512 bytes {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 18446744073709551104}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 18446744073709551104}}} {"return": {}} Job failed: Could not resize image: Image size cannot be negative {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 9223372036854775808}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 9223372036854775808}}} {"return": {}} Job failed: Could not resize image: Image size cannot be negative {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 9223372036854775296}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 9223372036854775296}}} {"return": {}} Job failed: Could not resize image: Failed to grow the L1 table: File too = large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 =3D=3D=3D Invalid version =3D=3D=3D -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 67108864, "version": "v1"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "size": 67108864, "version": "v1"}}} {"error": {"class": "GenericError", "desc": "Invalid parameter 'v1'"}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "lazy-refcounts": true, "size": 671088= 64, "version": "v2"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "lazy-refcounts": true, "size": 671088= 64, "version": "v2"}}} {"return": {}} Job failed: Lazy refcounts only supported with compatibility level 1.1 and= above (use version=3Dv3 or greater) {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 8, "size": 67108864, = "version": "v2"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 8, "size": 67108864, = "version": "v2"}}} {"return": {}} Job failed: Different refcount widths than 16 bits require compatibility l= evel 1.1 or above (use version=3Dv3 or greater) {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 =3D=3D=3D Invalid backing file options =3D=3D=3D -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"backing-file": "/dev/null", "driver": "qcow2", "file": "node0", "prealloc= ation": "full", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"backing-file": "/dev/null", "driver": "qcow2", "file": "node0", "prealloc= ation": "full", "size": 67108864}}} {"return": {}} Job failed: Backing file and preallocation cannot be used at the same time {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"backing-fmt": "qcow2", "driver": "qcow2", "file": "node0", "size": 671088= 64}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"backing-fmt": "qcow2", "driver": "qcow2", "file": "node0", "size": 671088= 64}}} {"return": {}} Job failed: Backing format cannot be used without backing file {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 =3D=3D=3D Invalid cluster size =3D=3D=3D -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 1234, "driver": "qcow2", "file": "node0", "size": 67108864= }}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 1234, "driver": "qcow2", "file": "node0", "size": 67108864= }}} {"return": {}} Job failed: Cluster size must be a power of two between 512 and 2048k {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 128, "driver": "qcow2", "file": "node0", "size": 67108864}= }} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 128, "driver": "qcow2", "file": "node0", "size": 67108864}= }} {"return": {}} Job failed: Cluster size must be a power of two between 512 and 2048k {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 4194304, "driver": "qcow2", "file": "node0", "size": 67108= 864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 4194304, "driver": "qcow2", "file": "node0", "size": 67108= 864}}} {"return": {}} Job failed: Cluster size must be a power of two between 512 and 2048k {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 0, "driver": "qcow2", "file": "node0", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 0, "driver": "qcow2", "file": "node0", "size": 67108864}}} {"return": {}} Job failed: Cluster size must be a power of two between 512 and 2048k {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 512, "driver": "qcow2", "file": "node0", "size": 281474976= 710656}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 512, "driver": "qcow2", "file": "node0", "size": 281474976= 710656}}} {"return": {}} Job failed: Could not resize image: Failed to grow the L1 table: File too = large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 =3D=3D=3D Invalid refcount width =3D=3D=3D -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 128, "size": 67108864= }}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 128, "size": 67108864= }}} {"return": {}} Job failed: Refcount width must be a power of two and may not exceed 64 bi= ts {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 0, "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 0, "size": 67108864}}} {"return": {}} Job failed: Refcount width must be a power of two and may not exceed 64 bi= ts {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 7, "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "qcow2", "file": "node0", "refcount-bits": 7, "size": 67108864}}} {"return": {}} Job failed: Refcount width must be a power of two and may not exceed 64 bi= ts {"execute": "job-dismiss", "arguments": {"id": "job0"}} diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out index 88d2240f54..568e8619d0 100644 --- a/tests/qemu-iotests/207.out +++ b/tests/qemu-iotests/207.out @@ -1,6 +1,6 @@ =3D=3D=3D Successful image creation (defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"path": "TEST_DIR/PID-t.img", "server": {"ho= st": "127.0.0.1", "port": "22"}}, "size": 4194304}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"path": "TEST_DIR/PID-t.img", "server": {"ho= st": "127.0.0.1", "port": "22"}}, "size": 4194304}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -16,7 +16,7 @@ virtual size: 4.0M (4194304 bytes) =20 =3D=3D=3D Test host-key-check options =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": = "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size= ": 8388608}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": = "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size= ": 8388608}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -25,7 +25,7 @@ image: json:{"driver": "IMGFMT", "file": {"server.host": = "127.0.0.1", "server.po file format: IMGFMT virtual size: 8.0M (8388608 bytes) =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "known_hosts"}, "= path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}= , "size": 4194304}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "known_hosts"}, "= path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}= , "size": 4194304}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -34,13 +34,13 @@ image: json:{"driver": "IMGFMT", "file": {"server.host"= : "127.0.0.1", "server.po file format: IMGFMT virtual size: 4.0M (4194304 bytes) =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": = "hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "1= 27.0.0.1", "port": "22"}}, "size": 2097152}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": = "hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "1= 27.0.0.1", "port": "22"}}, "size": 2097152}}} {"return": {}} Job failed: remote host key does not match host_key_check 'wrong' {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "HASH", "mode": "= hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "12= 7.0.0.1", "port": "22"}}, "size": 8388608}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "HASH", "mode": "= hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "12= 7.0.0.1", "port": "22"}}, "size": 8388608}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -49,13 +49,13 @@ image: json:{"driver": "IMGFMT", "file": {"server.host"= : "127.0.0.1", "server.po file format: IMGFMT virtual size: 8.0M (8388608 bytes) =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": = "hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "= 127.0.0.1", "port": "22"}}, "size": 2097152}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": = "hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "= 127.0.0.1", "port": "22"}}, "size": 2097152}}} {"return": {}} Job failed: remote host key does not match host_key_check 'wrong' {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "HASH", "mode": "= hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "1= 27.0.0.1", "port": "22"}}, "size": 4194304}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"hash": "HASH", "mode": "= hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "1= 27.0.0.1", "port": "22"}}, "size": 4194304}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -66,13 +66,13 @@ virtual size: 4.0M (4194304 bytes) =20 =3D=3D=3D Invalid path and user =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": = "/this/is/not/an/existing/path", "server": {"host": "127.0.0.1", "port": "2= 2"}}, "size": 4194304}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": = "/this/is/not/an/existing/path", "server": {"host": "127.0.0.1", "port": "2= 2"}}, "size": 4194304}}} {"return": {}} Job failed: failed to open remote file '/this/is/not/an/existing/path': Fa= iled opening remote file (libssh2 error code: -31) {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": = "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}, "user"= : "invalid user"}, "size": 4194304}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "ssh", "location": {"host-key-check": {"mode": "none"}, "path": = "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}, "user"= : "invalid user"}, "size": 4194304}}} {"return": {}} Job failed: failed to authenticate using publickey authentication and the = identities held by your ssh-agent {"execute": "job-dismiss", "arguments": {"id": "job0"}} diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out index 923cb05117..a3692ce00d 100644 --- a/tests/qemu-iotests/210.out +++ b/tests/qemu-iotests/210.out @@ -1,13 +1,13 @@ =3D=3D=3D Successful image creation (defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.luks", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.luks", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.luks", "node_name": "imgfile"}} +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.luks", "node-name": "imgfile"}} {"return": {}} -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "luks", "file": "imgfile", "iter-time": 10, "key-secret": "keyse= c0", "size": 134217728}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "luks", "file": "imgfile", "iter-time": 10, "key-secret": "keyse= c0", "size": 134217728}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -54,12 +54,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.luks", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.luks", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "driver": "luks", "file= ": {"driver": "file", "filename": "TEST_DIR/PID-t.luks"}, "hash-alg": "sha1= ", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-s= ecret": "keysec0", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "driver": "luks", "file= ": {"driver": "file", "filename": "TEST_DIR/PID-t.luks"}, "hash-alg": "sha1= ", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-s= ecret": "keysec0", "size": 67108864}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -106,7 +106,7 @@ Format specific information: =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "luks", "file": "this doesn't exist", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "luks", "file": "this doesn't exist", "size": 67108864}}} {"return": {}} Job failed: Cannot find device=3Dthis doesn't exist nor node_name=3Dthis d= oesn't exist {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -114,7 +114,7 @@ Job failed: Cannot find device=3Dthis doesn't exist nor= node_name=3Dthis doesn't exi =20 =3D=3D=3D Zero size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "luks", "file": "node0", "iter-time": 10, "key-secret": "keysec0= ", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "luks", "file": "node0", "iter-time": 10, "key-secret": "keysec0= ", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -161,19 +161,19 @@ Format specific information: =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 184467= 44073709551104}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 184467= 44073709551104}}} {"return": {}} Job failed: The requested file size is too large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 922337= 2036854775808}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 922337= 2036854775808}}} {"return": {}} Job failed: The requested file size is too large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 922337= 2036854775296}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "luks", "file": "node0", "key-secret": "keysec0", "size": 922337= 2036854775296}}} {"return": {}} Job failed: The requested file size is too large {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -181,13 +181,13 @@ Job failed: The requested file size is too large =20 =3D=3D=3D Resize image with invalid sizes =3D=3D=3D =20 -{"execute": "block_resize", "arguments": {"node_name": "node1", "size": 92= 23372036854775296}} +{"execute": "block_resize", "arguments": {"node-name": "node1", "size": 92= 23372036854775296}} {"error": {"class": "GenericError", "desc": "The requested file size is to= o large"}} -{"execute": "block_resize", "arguments": {"node_name": "node1", "size": 92= 23372036854775808}} +{"execute": "block_resize", "arguments": {"node-name": "node1", "size": 92= 23372036854775808}} {"error": {"class": "GenericError", "desc": "Invalid parameter type for 's= ize', expected: integer"}} -{"execute": "block_resize", "arguments": {"node_name": "node1", "size": 18= 446744073709551104}} +{"execute": "block_resize", "arguments": {"node-name": "node1", "size": 18= 446744073709551104}} {"error": {"class": "GenericError", "desc": "Invalid parameter type for 's= ize', expected: integer"}} -{"execute": "block_resize", "arguments": {"node_name": "node1", "size": -9= 223372036854775808}} +{"execute": "block_resize", "arguments": {"node-name": "node1", "size": -9= 223372036854775808}} {"error": {"class": "GenericError", "desc": "Parameter 'size' expects a >0= size"}} image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "T= EST_IMG"}, "key-secret": "keysec0"} file format: IMGFMT diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out index eebb0ea086..682adc2a10 100644 --- a/tests/qemu-iotests/211.out +++ b/tests/qemu-iotests/211.out @@ -1,13 +1,13 @@ =3D=3D=3D Successful image creation (defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.vdi", "node_name": "imgfile"}} +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.vdi", "node-name": "imgfile"}} {"return": {}} -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": "imgfile", "size": 134217728}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": "imgfile", "size": 134217728}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -21,12 +21,12 @@ cluster_size: 1048576 =20 =3D=3D=3D Successful image creation (explicit defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.vd= i"}, "preallocation": "off", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.vd= i"}, "preallocation": "off", "size": 67108864}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -40,12 +40,12 @@ cluster_size: 1048576 =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.vd= i"}, "preallocation": "metadata", "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.vd= i"}, "preallocation": "metadata", "size": 33554432}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -60,7 +60,7 @@ cluster_size: 1048576 =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": "this doesn't exist", "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": "this doesn't exist", "size": 33554432}}} {"return": {}} Job failed: Cannot find device=3Dthis doesn't exist nor node_name=3Dthis d= oesn't exist {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -68,7 +68,7 @@ Job failed: Cannot find device=3Dthis doesn't exist nor n= ode_name=3Dthis doesn't exi =20 =3D=3D=3D Zero size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -80,7 +80,7 @@ cluster_size: 1048576 =20 =3D=3D=3D Maximum size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 562949819203584}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 562949819203584}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -92,19 +92,19 @@ cluster_size: 1048576 =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 18446744073709551104}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 18446744073709551104}}} {"return": {}} Job failed: Unsupported VDI image size (size is 0xfffffffffffffe00, max su= pported is 0x1fffff8000000) {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 9223372036854775808}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 9223372036854775808}}} {"return": {}} Job failed: Unsupported VDI image size (size is 0x8000000000000000, max su= pported is 0x1fffff8000000) {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 562949819203585}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vdi", "file": "node0", "size": 562949819203585}}} {"return": {}} Job failed: Unsupported VDI image size (size is 0x1fffff8000001, max suppo= rted is 0x1fffff8000000) {"execute": "job-dismiss", "arguments": {"id": "job0"}} diff --git a/tests/qemu-iotests/212.out b/tests/qemu-iotests/212.out index 01da467282..22810720cf 100644 --- a/tests/qemu-iotests/212.out +++ b/tests/qemu-iotests/212.out @@ -1,13 +1,13 @@ =3D=3D=3D Successful image creation (defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.parallels", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.parallels", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.parallels", "node_name": "imgfile"}} +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.parallels", "node-name": "imgfile"}} {"return": {}} -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "imgfile", "size": 134217728}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "imgfile", "size": 134217728}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -18,12 +18,12 @@ virtual size: 128M (134217728 bytes) =20 =3D=3D=3D Successful image creation (explicit defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.parallels", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.parallels", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 1048576, "driver": "parallels", "file": {"driver": "file",= "filename": "TEST_DIR/PID-t.parallels"}, "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 1048576, "driver": "parallels", "file": {"driver": "file",= "filename": "TEST_DIR/PID-t.parallels"}, "size": 67108864}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -34,12 +34,12 @@ virtual size: 64M (67108864 bytes) =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.parallels", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.parallels", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 65536, "driver": "parallels", "file": {"driver": "file", "= filename": "TEST_DIR/PID-t.parallels"}, "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 65536, "driver": "parallels", "file": {"driver": "file", "= filename": "TEST_DIR/PID-t.parallels"}, "size": 33554432}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -50,7 +50,7 @@ virtual size: 32M (33554432 bytes) =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "this doesn't exist", "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "this doesn't exist", "size": 33554432}}} {"return": {}} Job failed: Cannot find device=3Dthis doesn't exist nor node_name=3Dthis d= oesn't exist {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -58,7 +58,7 @@ Job failed: Cannot find device=3Dthis doesn't exist nor n= ode_name=3Dthis doesn't exi =20 =3D=3D=3D Zero size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -69,7 +69,7 @@ virtual size: 0 (0 bytes) =20 =3D=3D=3D Maximum size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 4503599627369984}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 4503599627369984}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -80,31 +80,31 @@ virtual size: 4096T (4503599627369984 bytes) =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 1234}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 1234}}} {"return": {}} Job failed: Image size must be a multiple of 512 bytes {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 18446744073709551104}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 18446744073709551104}}} {"return": {}} Job failed: Image size is too large for this cluster size {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 9223372036854775808}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 9223372036854775808}}} {"return": {}} Job failed: Image size is too large for this cluster size {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 9223372036854775296}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 9223372036854775296}}} {"return": {}} Job failed: Image size is too large for this cluster size {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 4503599627370497}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "parallels", "file": "node0", "size": 4503599627370497}}} {"return": {}} Job failed: Image size is too large for this cluster size {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -112,43 +112,43 @@ Job failed: Image size is too large for this cluster = size =20 =3D=3D=3D Invalid cluster size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 1234, "driver": "parallels", "file": "node0", "size": 6710= 8864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 1234, "driver": "parallels", "file": "node0", "size": 6710= 8864}}} {"return": {}} Job failed: Cluster size must be a multiple of 512 bytes {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 128, "driver": "parallels", "file": "node0", "size": 67108= 864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 128, "driver": "parallels", "file": "node0", "size": 67108= 864}}} {"return": {}} Job failed: Cluster size must be a multiple of 512 bytes {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 4294967296, "driver": "parallels", "file": "node0", "size"= : 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 4294967296, "driver": "parallels", "file": "node0", "size"= : 67108864}}} {"return": {}} Job failed: Cluster size is too large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 9223372036854775808, "driver": "parallels", "file": "node0= ", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 9223372036854775808, "driver": "parallels", "file": "node0= ", "size": 67108864}}} {"return": {}} Job failed: Cluster size is too large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 18446744073709551104, "driver": "parallels", "file": "node= 0", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 18446744073709551104, "driver": "parallels", "file": "node= 0", "size": 67108864}}} {"return": {}} Job failed: Cluster size is too large {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 0, "driver": "parallels", "file": "node0", "size": 6710886= 4}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 0, "driver": "parallels", "file": "node0", "size": 6710886= 4}}} {"return": {}} Job failed: Image size is too large for this cluster size {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"cluster-size": 512, "driver": "parallels", "file": "node0", "size": 28147= 4976710656}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"cluster-size": 512, "driver": "parallels", "file": "node0", "size": 28147= 4976710656}}} {"return": {}} Job failed: Image size is too large for this cluster size {"execute": "job-dismiss", "arguments": {"id": "job0"}} diff --git a/tests/qemu-iotests/213.out b/tests/qemu-iotests/213.out index 0c9d65b2fe..169083e08e 100644 --- a/tests/qemu-iotests/213.out +++ b/tests/qemu-iotests/213.out @@ -1,13 +1,13 @@ =3D=3D=3D Successful image creation (defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.vhdx", "node_name": "imgfile"}} +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.vhdx", "node-name": "imgfile"}} {"return": {}} -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "imgfile", "size": 134217728}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "imgfile", "size": 134217728}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -19,12 +19,12 @@ cluster_size: 8388608 =20 =3D=3D=3D Successful image creation (explicit defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"block-size": 8388608, "block-state-zero": true, "driver": "vhdx", "file":= {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx"}, "log-size": 1048576= , "size": 67108864, "subformat": "dynamic"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"block-size": 8388608, "block-state-zero": true, "driver": "vhdx", "file":= {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx"}, "log-size": 1048576= , "size": 67108864, "subformat": "dynamic"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -36,12 +36,12 @@ cluster_size: 8388608 =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"block-size": 268435456, "block-state-zero": false, "driver": "vhdx", "fil= e": {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx"}, "log-size": 8388= 608, "size": 33554432, "subformat": "fixed"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"block-size": 268435456, "block-state-zero": false, "driver": "vhdx", "fil= e": {"driver": "file", "filename": "TEST_DIR/PID-t.vhdx"}, "log-size": 8388= 608, "size": 33554432, "subformat": "fixed"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -53,7 +53,7 @@ cluster_size: 268435456 =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "this doesn't exist", "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "this doesn't exist", "size": 33554432}}} {"return": {}} Job failed: Cannot find device=3Dthis doesn't exist nor node_name=3Dthis d= oesn't exist {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -61,7 +61,7 @@ Job failed: Cannot find device=3Dthis doesn't exist nor n= ode_name=3Dthis doesn't exi =20 =3D=3D=3D Zero size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -73,7 +73,7 @@ cluster_size: 8388608 =20 =3D=3D=3D Maximum size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 70368744177664}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 70368744177664}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -85,25 +85,25 @@ cluster_size: 67108864 =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 18446744073709551104}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 18446744073709551104}}} {"return": {}} Job failed: Image size too large; max of 64TB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 9223372036854775808}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 9223372036854775808}}} {"return": {}} Job failed: Image size too large; max of 64TB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 9223372036854775296}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 9223372036854775296}}} {"return": {}} Job failed: Image size too large; max of 64TB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 70368744177665}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "size": 70368744177665}}} {"return": {}} Job failed: Image size too large; max of 64TB {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -111,31 +111,31 @@ Job failed: Image size too large; max of 64TB =20 =3D=3D=3D Invalid block size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"block-size": 1234567, "driver": "vhdx", "file": "node0", "size": 67108864= }}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"block-size": 1234567, "driver": "vhdx", "file": "node0", "size": 67108864= }}} {"return": {}} Job failed: Block size must be a multiple of 1 MB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"block-size": 128, "driver": "vhdx", "file": "node0", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"block-size": 128, "driver": "vhdx", "file": "node0", "size": 67108864}}} {"return": {}} Job failed: Block size must be a multiple of 1 MB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"block-size": 3145728, "driver": "vhdx", "file": "node0", "size": 67108864= }}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"block-size": 3145728, "driver": "vhdx", "file": "node0", "size": 67108864= }}} {"return": {}} Job failed: Block size must be a power of two {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"block-size": 536870912, "driver": "vhdx", "file": "node0", "size": 671088= 64}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"block-size": 536870912, "driver": "vhdx", "file": "node0", "size": 671088= 64}}} {"return": {}} Job failed: Block size must not exceed 268435456 {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"block-size": 0, "driver": "vhdx", "file": "node0", "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"block-size": 0, "driver": "vhdx", "file": "node0", "size": 67108864}}} {"return": {}} Job failed: Block size must be a multiple of 1 MB {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -143,25 +143,25 @@ Job failed: Block size must be a multiple of 1 MB =20 =3D=3D=3D Invalid log size =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 1234567, "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 1234567, "size": 67108864}}} {"return": {}} Job failed: Log size must be a multiple of 1 MB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 128, "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 128, "size": 67108864}}} {"return": {}} Job failed: Log size must be a multiple of 1 MB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 4294967296, "size": 6710886= 4}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 4294967296, "size": 6710886= 4}}} {"return": {}} Job failed: Log size must be smaller than 4 GB {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 0, "size": 67108864}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vhdx", "file": "node0", "log-size": 0, "size": 67108864}}} {"return": {}} Job failed: Log size must be a multiple of 1 MB {"execute": "job-dismiss", "arguments": {"id": "job0"}} diff --git a/tests/qemu-iotests/237.out b/tests/qemu-iotests/237.out index 241c864369..2aaa68f672 100644 --- a/tests/qemu-iotests/237.out +++ b/tests/qemu-iotests/237.out @@ -1,13 +1,13 @@ =3D=3D=3D Successful image creation (defaults) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vmdk", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vmdk", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.vmdk", "node_name": "imgfile"}} +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": "T= EST_DIR/PID-t.vmdk", "node-name": "imgfile"}} {"return": {}} -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "file": "imgfile", "size": 5368709120}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "file": "imgfile", "size": 5368709120}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -29,12 +29,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (inline blockdev-add, explicit default= s) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vmdk", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vmdk", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "ide", "driver": "vmdk", "extents": [], "file": {"driver":= "file", "filename": "TEST_DIR/PID-t.vmdk"}, "hwversion": "4", "size": 6710= 8864, "subformat": "monolithicSparse", "zeroed-grain": false}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "ide", "driver": "vmdk", "extents": [], "file": {"driver":= "file", "filename": "TEST_DIR/PID-t.vmdk"}, "hwversion": "4", "size": 6710= 8864, "subformat": "monolithicSparse", "zeroed-grain": false}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -56,12 +56,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vmdk", "size": 0}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "file", "filename": "TEST_DIR/PID-t.vmdk", "size": 0}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "buslogic", "driver": "vmdk", "extents": [], "file": {"dri= ver": "file", "filename": "TEST_DIR/PID-t.vmdk"}, "size": 33554432, "subfor= mat": "monolithicSparse", "zeroed-grain": true}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "buslogic", "driver": "vmdk", "extents": [], "file": {"dri= ver": "file", "filename": "TEST_DIR/PID-t.vmdk"}, "size": 33554432, "subfor= mat": "monolithicSparse", "zeroed-grain": true}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -83,7 +83,7 @@ Format specific information: =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "file": "this doesn't exist", "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "file": "this doesn't exist", "size": 33554432}}} {"return": {}} Job failed: Cannot find device=3Dthis doesn't exist nor node_name=3Dthis d= oesn't exist {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -93,38 +93,38 @@ Job failed: Cannot find device=3Dthis doesn't exist nor= node_name=3Dthis doesn't exi =20 =3D=3D Valid adapter types =3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "ide", "driver": "vmdk", "file": "node0", "size": 33554432= }}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "ide", "driver": "vmdk", "file": "node0", "size": 33554432= }}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "buslogic", "driver": "vmdk", "file": "node0", "size": 335= 54432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "buslogic", "driver": "vmdk", "file": "node0", "size": 335= 54432}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "lsilogic", "driver": "vmdk", "file": "node0", "size": 335= 54432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "lsilogic", "driver": "vmdk", "file": "node0", "size": 335= 54432}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "legacyESX", "driver": "vmdk", "file": "node0", "size": 33= 554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "legacyESX", "driver": "vmdk", "file": "node0", "size": 33= 554432}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 =3D=3D Invalid adapter types =3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "foo", "driver": "vmdk", "file": "node0", "size": 33554432= }}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "foo", "driver": "vmdk", "file": "node0", "size": 33554432= }}} {"error": {"class": "GenericError", "desc": "Invalid parameter 'foo'"}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "IDE", "driver": "vmdk", "file": "node0", "size": 33554432= }}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "IDE", "driver": "vmdk", "file": "node0", "size": 33554432= }}} {"error": {"class": "GenericError", "desc": "Invalid parameter 'IDE'"}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": "legacyesx", "driver": "vmdk", "file": "node0", "size": 33= 554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": "legacyesx", "driver": "vmdk", "file": "node0", "size": 33= 554432}}} {"error": {"class": "GenericError", "desc": "Invalid parameter 'legacyesx'= "}} =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"adapter-type": 1, "driver": "vmdk", "file": "node0", "size": 33554432}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"adapter-type": 1, "driver": "vmdk", "file": "node0", "size": 33554432}}} {"error": {"class": "GenericError", "desc": "Invalid parameter type for 'o= ptions.adapter-type', expected: string"}} =20 =3D=3D=3D Other subformats =3D=3D=3D @@ -137,7 +137,7 @@ Formatting 'TEST_DIR/PID-t.vmdk.3', fmt=3Dvmdk size=3D0= compat6=3Doff hwversion=3Dundefi =20 =3D=3D Missing extent =3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "file": "node0", "size": 33554432, "subformat": "monolit= hicFlat"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "file": "node0", "size": 33554432, "subformat": "monolit= hicFlat"}}} {"return": {}} Job failed: Extent [0] not specified {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -145,14 +145,14 @@ Job failed: Extent [0] not specified =20 =3D=3D Correct extent =3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 33554432, = "subformat": "monolithicFlat"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 33554432, = "subformat": "monolithicFlat"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} =20 =3D=3D Extra extent =3D=3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1", "ext2", "ext3"], "file": "node0", "s= ize": 512, "subformat": "monolithicFlat"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1", "ext2", "ext3"], "file": "node0", "s= ize": 512, "subformat": "monolithicFlat"}}} {"return": {}} Job failed: List of extents contains unused extents {"execute": "job-dismiss", "arguments": {"id": "job0"}} @@ -162,7 +162,7 @@ Job failed: List of extents contains unused extents =20 =3D twoGbMaxExtentFlat 512 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 512, "subf= ormat": "twoGbMaxExtentFlat"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 512, "subf= ormat": "twoGbMaxExtentFlat"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -182,7 +182,7 @@ Format specific information: =20 =3D twoGbMaxExtentSparse 512 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 512, "subf= ormat": "twoGbMaxExtentSparse"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 512, "subf= ormat": "twoGbMaxExtentSparse"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -204,7 +204,7 @@ Format specific information: =20 =3D twoGbMaxExtentFlat 1073741824 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 1073741824= , "subformat": "twoGbMaxExtentFlat"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 1073741824= , "subformat": "twoGbMaxExtentFlat"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -224,7 +224,7 @@ Format specific information: =20 =3D twoGbMaxExtentSparse 1073741824 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 1073741824= , "subformat": "twoGbMaxExtentSparse"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 1073741824= , "subformat": "twoGbMaxExtentSparse"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -246,7 +246,7 @@ Format specific information: =20 =3D twoGbMaxExtentFlat 2147483648 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 2147483648= , "subformat": "twoGbMaxExtentFlat"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 2147483648= , "subformat": "twoGbMaxExtentFlat"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -266,7 +266,7 @@ Format specific information: =20 =3D twoGbMaxExtentSparse 2147483648 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 2147483648= , "subformat": "twoGbMaxExtentSparse"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1"], "file": "node0", "size": 2147483648= , "subformat": "twoGbMaxExtentSparse"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -288,7 +288,7 @@ Format specific information: =20 =3D twoGbMaxExtentFlat 5368709120 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1", "ext2", "ext3"], "file": "node0", "s= ize": 5368709120, "subformat": "twoGbMaxExtentFlat"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1", "ext2", "ext3"], "file": "node0", "s= ize": 5368709120, "subformat": "twoGbMaxExtentFlat"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -316,7 +316,7 @@ Format specific information: =20 =3D twoGbMaxExtentSparse 5368709120 =3D =20 -{"execute": "blockdev-create", "arguments": {"job_id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1", "ext2", "ext3"], "file": "node0", "s= ize": 5368709120, "subformat": "twoGbMaxExtentSparse"}}} +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": = {"driver": "vmdk", "extents": ["ext1", "ext2", "ext3"], "file": "node0", "s= ize": 5368709120, "subformat": "twoGbMaxExtentSparse"}}} {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index b6cb73e108..390954437c 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -76,12 +76,14 @@ def qemu_img(*args): sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode,= ' '.join(qemu_img_args + list(args)))) return exitcode =20 -def ordered_kwargs(kwargs): +def ordered_kwargs(kwargs, conv_keys=3DTrue): # kwargs prior to 3.6 are not ordered, so: od =3D OrderedDict() for k, v in sorted(kwargs.items()): + if conv_keys: + k =3D k.replace('_', '-') if isinstance(v, dict): - od[k] =3D ordered_kwargs(v) + od[k] =3D ordered_kwargs(v, conv_keys=3DFalse) else: od[k] =3D v return od --=20 2.20.1