From nobody Sun Nov 2 11:43:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527627049737988.2364324753506; Tue, 29 May 2018 13:50:49 -0700 (PDT) Received: from localhost ([::1]:34990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNlZw-0003RC-Ku for importer@patchew.org; Tue, 29 May 2018 16:50:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNlPX-0003nC-9k for qemu-devel@nongnu.org; Tue, 29 May 2018 16:40:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNlPR-0008N6-CB for qemu-devel@nongnu.org; Tue, 29 May 2018 16:40:03 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50704 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fNlPF-0008AT-5l; Tue, 29 May 2018 16:39:45 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBE89814FDCF; Tue, 29 May 2018 20:39:44 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-193.ams2.redhat.com [10.36.116.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E7ED6403C; Tue, 29 May 2018 20:39:43 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 29 May 2018 22:39:10 +0200 Message-Id: <20180529203910.7615-17-kwolf@redhat.com> In-Reply-To: <20180529203910.7615-1-kwolf@redhat.com> References: <20180529203910.7615-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 29 May 2018 20:39:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 29 May 2018 20:39:44 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 16/16] block/create: Mark blockdev-create stable 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: kwolf@redhat.com, pkrempa@redhat.com, jsnow@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We're ready to declare the blockdev-create job stable. This renames the corresponding QMP command from x-blockdev-create to blockdev-create. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Jeff Cody --- qapi/block-core.json | 4 ++-- qapi/job.json | 2 +- block/create.c | 4 ++-- tests/qemu-iotests/206 | 2 +- tests/qemu-iotests/206.out | 54 +++++++++++++++++++++++-------------------= ---- tests/qemu-iotests/207 | 2 +- tests/qemu-iotests/207.out | 18 ++++++++-------- tests/qemu-iotests/210 | 2 +- tests/qemu-iotests/210.out | 18 ++++++++-------- tests/qemu-iotests/211 | 2 +- tests/qemu-iotests/211.out | 24 ++++++++++----------- tests/qemu-iotests/212 | 2 +- tests/qemu-iotests/212.out | 42 ++++++++++++++++++------------------ tests/qemu-iotests/213 | 2 +- tests/qemu-iotests/213.out | 44 ++++++++++++++++++------------------- 15 files changed, 111 insertions(+), 111 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index eb98596614..4b1de474a9 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4011,7 +4011,7 @@ } } =20 ## -# @x-blockdev-create: +# @blockdev-create: # # Starts a job to create an image format on a given node. The job is # automatically finalized, but a manual job-dismiss is required. @@ -4022,7 +4022,7 @@ # # Since: 3.0 ## -{ 'command': 'x-blockdev-create', +{ 'command': 'blockdev-create', 'data': { 'job-id': 'str', 'options': 'BlockdevCreateOptions' } } =20 diff --git a/qapi/job.json b/qapi/job.json index 69c1970a58..17d10037c4 100644 --- a/qapi/job.json +++ b/qapi/job.json @@ -17,7 +17,7 @@ # # @backup: drive backup job type, see "drive-backup" # -# @create: image creation job type, see "x-blockdev-create" (since 3.0) +# @create: image creation job type, see "blockdev-create" (since 3.0) # # Since: 1.7 ## diff --git a/block/create.c b/block/create.c index 1a263e4b13..915cd41bcc 100644 --- a/block/create.c +++ b/block/create.c @@ -63,8 +63,8 @@ static const JobDriver blockdev_create_job_driver =3D { .start =3D blockdev_create_run, }; =20 -void qmp_x_blockdev_create(const char *job_id, BlockdevCreateOptions *opti= ons, - Error **errp) +void qmp_blockdev_create(const char *job_id, BlockdevCreateOptions *option= s, + Error **errp) { BlockdevCreateJob *s; const char *fmt =3D BlockdevDriver_str(options->driver); diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206 index b8cf2e7dca..128c334c7c 100755 --- a/tests/qemu-iotests/206 +++ b/tests/qemu-iotests/206 @@ -26,7 +26,7 @@ from iotests import imgfmt iotests.verify_image_format(supported_fmts=3D['qcow2']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('x-blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) =20 if 'return' in result: assert result['return'] =3D=3D {} diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out index 34451a3fc6..789eebe57b 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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 {'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver'= : 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}} {u'return': {}} -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'nocow': False, 'preallocation': 'off', 'size': 0, 'driver': 'file', 'fi= lename': 'TEST_DIR/PID-t.qcow2'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'nocow': False, 'preallocation': 'off', 'size': 0, 'driver': 'file', 'file= name': 'TEST_DIR/PID-t.qcow2'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 65536, 'refcount-bits': 16, 'version': 'v3', 'preallocat= ion': 'off', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}= , 'lazy-refcounts': False, 'driver': 'qcow2', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 65536, 'refcount-bits': 16, 'version': 'v3', 'preallocatio= n': 'off', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, = 'lazy-refcounts': False, 'driver': 'qcow2', 'size': 67108864}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -46,12 +46,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (v3 non-default options) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'nocow': True, 'preallocation': 'falloc', 'size': 0, 'driver': 'file', '= filename': 'TEST_DIR/PID-t.qcow2'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'nocow': True, 'preallocation': 'falloc', 'size': 0, 'driver': 'file', 'fi= lename': 'TEST_DIR/PID-t.qcow2'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 2097152, 'refcount-bits': 1, 'version': 'v3', 'prealloca= tion': 'metadata', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.q= cow2'}, 'lazy-refcounts': True, 'driver': 'qcow2', 'size': 33554432}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 2097152, 'refcount-bits': 1, 'version': 'v3', 'preallocati= on': 'metadata', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qco= w2'}, 'lazy-refcounts': True, 'driver': 'qcow2', 'size': 33554432}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -68,12 +68,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (v2 non-default options) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 512, 'backing-fmt': 'qcow2', 'driver': 'qcow2', 'version= ': 'v2', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'b= acking-file': 'TEST_DIR/PID-t.qcow2.base', 'size': 33554432}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 512, 'backing-fmt': 'qcow2', 'driver': 'qcow2', 'version':= 'v2', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'bac= king-file': 'TEST_DIR/PID-t.qcow2.base', 'size': 33554432}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -90,7 +90,7 @@ Format specific information: =20 =3D=3D=3D Successful image creation (encrypted) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'encrypt': {'key-secret': 'keysec0', 'iter-time': 10, 'cipher-mode': 'ct= r', 'ivgen-hash-alg': 'md5', 'cipher-alg': 'twofish-128', 'format': 'luks',= 'ivgen-alg': 'plain64', 'hash-alg': 'sha1'}, 'driver': 'qcow2', 'file': {'= driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'size': 33554432}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'encrypt': {'key-secret': 'keysec0', 'iter-time': 10, 'cipher-mode': 'ctr'= , 'ivgen-hash-alg': 'md5', 'cipher-alg': 'twofish-128', 'format': 'luks', '= ivgen-alg': 'plain64', 'hash-alg': 'sha1'}, 'driver': 'qcow2', 'file': {'dr= iver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'size': 33554432}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -144,111 +144,111 @@ Format specific information: =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{'execute': 'x-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}}} {u'return': {}} Job failed: Cannot find device=3Dthis doesn't exist nor node_name=3Dthis d= oesn't exist {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 =3D=3D=3D Invalid sizes =3D=3D=3D -{'execute': 'x-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}}} {u'return': {}} Job failed: Image size must be a multiple of 512 bytes {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'qcow2', 'file': 'node0', 'size': 18446744073709551104L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'qcow2', 'file': 'node0', 'size': 18446744073709551104L}}} {u'return': {}} Job failed: Could not resize image: Image size cannot be negative {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'qcow2', 'file': 'node0', 'size': 9223372036854775808L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'qcow2', 'file': 'node0', 'size': 9223372036854775808L}}} {u'return': {}} Job failed: Could not resize image: Image size cannot be negative {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'return': {}} Job failed: Could not resize image: Failed to grow the L1 table: File too = large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 =3D=3D=3D Invalid version =3D=3D=3D -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'version': 'v1', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'version': 'v1', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}} {u'error': {u'class': u'GenericError', u'desc': u"Invalid parameter 'v1'"}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'lazy-refcounts': True, 'version': 'v2', 'driver': 'qcow2', 'file': 'nod= e0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'lazy-refcounts': True, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0= ', 'size': 67108864}}} {u'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'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'refcount-bits': 8, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0',= 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'refcount-bits': 8, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0', '= size': 67108864}}} {u'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'}} {u'return': {}} =20 =3D=3D=3D Invalid backing file options =3D=3D=3D -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'preallocation': 'full', 'driver': 'qcow2', 'backing-file': '/dev/null',= 'file': 'node0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'preallocation': 'full', 'driver': 'qcow2', 'backing-file': '/dev/null', '= file': 'node0', 'size': 67108864}}} {u'return': {}} Job failed: Backing file and preallocation cannot be used at the same time {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'backing-fmt': 'qcow2', 'driver': 'qcow2', 'file': 'node0', 'size': 6710= 8864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'backing-fmt': 'qcow2', 'driver': 'qcow2', 'file': 'node0', 'size': 671088= 64}}} {u'return': {}} Job failed: Backing format cannot be used without backing file {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 =3D=3D=3D Invalid cluster size =3D=3D=3D -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 1234, 'driver': 'qcow2', 'file': 'node0', 'size': 671088= 64}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 1234, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864= }}} {u'return': {}} Job failed: Cluster size must be a power of two between 512 and 2048k {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 6710886= 4}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}= }} {u'return': {}} Job failed: Cluster size must be a power of two between 512 and 2048k {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 4194304, 'driver': 'qcow2', 'file': 'node0', 'size': 671= 08864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 4194304, 'driver': 'qcow2', 'file': 'node0', 'size': 67108= 864}}} {u'return': {}} Job failed: Cluster size must be a power of two between 512 and 2048k {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'return': {}} Job failed: Cluster size must be a power of two between 512 and 2048k {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 512, 'driver': 'qcow2', 'file': 'node0', 'size': 2814749= 76710656}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 512, 'driver': 'qcow2', 'file': 'node0', 'size': 281474976= 710656}}} {u'return': {}} Job failed: Could not resize image: Failed to grow the L1 table: File too = large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 =3D=3D=3D Invalid refcount width =3D=3D=3D -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'refcount-bits': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 671088= 64}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'refcount-bits': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864= }}} {u'return': {}} Job failed: Refcount width must be a power of two and may not exceed 64 bi= ts {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'refcount-bits': 0, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864= }}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'refcount-bits': 0, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}} {u'return': {}} Job failed: Refcount width must be a power of two and may not exceed 64 bi= ts {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'refcount-bits': 7, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864= }}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'refcount-bits': 7, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}} {u'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 b/tests/qemu-iotests/207 index b595c925a5..444ae233ae 100755 --- a/tests/qemu-iotests/207 +++ b/tests/qemu-iotests/207 @@ -31,7 +31,7 @@ def filter_hash(msg): return re.sub("'hash': '[0-9a-f]+'", "'hash': HASH", msg) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('x-blockdev-create', job_id=3D'job0', options=3D= options, + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions, filters=3D[iotests.filter_testfiles, filter_hash]) =20 if 'return' in result: diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out index 5eee17bdb9..078b7e63cb 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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'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': {'path': 'TEST_DIR/PID-t.img', 'server': {'ho= st': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-ch= eck': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'si= ze': 8388608}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-chec= k': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size= ': 8388608}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-ch= eck': {'mode': 'known_hosts'}, 'server': {'host': '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', 'host-key-chec= k': {'mode': 'known_hosts'}, 'server': {'host': '127.0.0.1', 'port': '22'}}= , 'size': 4194304}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-ch= eck': {'hash': 'wrong', 'type': 'md5', 'mode': 'hash'}, 'server': {'host': = '127.0.0.1', 'port': '22'}}, 'size': 2097152}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-chec= k': {'hash': 'wrong', 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '1= 27.0.0.1', 'port': '22'}}, 'size': 2097152}}} {u'return': {}} Job failed: remote host key does not match host_key_check 'wrong' {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-ch= eck': {'hash': HASH, 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '12= 7.0.0.1', 'port': '22'}}, 'size': 8388608}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-chec= k': {'hash': HASH, 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.= 0.0.1', 'port': '22'}}, 'size': 8388608}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-ch= eck': {'hash': 'wrong', 'type': 'sha1', 'mode': 'hash'}, 'server': {'host':= '127.0.0.1', 'port': '22'}}, 'size': 2097152}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-chec= k': {'hash': 'wrong', 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '= 127.0.0.1', 'port': '22'}}, 'size': 2097152}}} {u'return': {}} Job failed: remote host key does not match host_key_check 'wrong' {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-ch= eck': {'hash': HASH, 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '1= 27.0.0.1', 'port': '22'}}, 'size': 4194304}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-chec= k': {'hash': HASH, 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '127= .0.0.1', 'port': '22'}}, 'size': 4194304}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -66,13 +66,13 @@ virtual size: 4.0M (4194304 bytes) =20 =3D=3D=3D Invalid path and user =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': '/this/is/not/an/existing/path', '= host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': = '22'}}, 'size': 4194304}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'ssh', 'location': {'path': '/this/is/not/an/existing/path', 'ho= st-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '2= 2'}}, 'size': 4194304}}} {u'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'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-ch= eck': {'mode': 'none'}, 'user': 'invalid user', 'server': {'host': '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', 'host-key-chec= k': {'mode': 'none'}, 'user': 'invalid user', 'server': {'host': '127.0.0.1= ', 'port': '22'}}, 'size': 4194304}}} {u'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 b/tests/qemu-iotests/210 index ff4fddea56..d142841e2b 100755 --- a/tests/qemu-iotests/210 +++ b/tests/qemu-iotests/210 @@ -27,7 +27,7 @@ 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('x-blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) =20 if 'return' in result: assert result['return'] =3D=3D {} diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out index 0e6e5c07be..078ba544a1 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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 {'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver'= : 'file', 'filename': 'TEST_DIR/PID-t.luks'}} {u'return': {}} -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'img= file', 'size': 134217728}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'imgfi= le', 'size': 134217728}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -54,12 +54,12 @@ Format specific information: =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'key-secret': 'keysec0', 'hash-alg': 'sha1', 'cipher-mode': 'ctr', 'ciph= er-alg': 'twofish-128', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PI= D-t.luks'}, 'iter-time': 10, 'ivgen-alg': 'plain64', 'ivgen-hash-alg': 'md5= ', 'driver': 'luks', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'key-secret': 'keysec0', 'hash-alg': 'sha1', 'cipher-mode': 'ctr', 'cipher= -alg': 'twofish-128', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-= t.luks'}, 'iter-time': 10, 'ivgen-alg': 'plain64', 'ivgen-hash-alg': 'md5',= 'driver': 'luks', 'size': 67108864}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -106,7 +106,7 @@ Format specific information: =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{'execute': 'x-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}}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'nod= e0', 'size': 0}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'node0= ', 'size': 0}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -161,19 +161,19 @@ Format specific information: =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 1844= 6744073709551104L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 184467= 44073709551104L}}} {u'return': {}} Job failed: The requested file size is too large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223= 372036854775808L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 922337= 2036854775808L}}} {u'return': {}} Job failed: The requested file size is too large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223= 372036854775296}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 922337= 2036854775296}}} {u'return': {}} Job failed: The requested file size is too large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211 index b45f886d23..7b7985db6c 100755 --- a/tests/qemu-iotests/211 +++ b/tests/qemu-iotests/211 @@ -27,7 +27,7 @@ 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('x-blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) =20 if 'return' in result: assert result['return'] =3D=3D {} diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out index 2bf1c4a920..6feaea3978 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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 {'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver'= : 'file', 'filename': 'TEST_DIR/PID-t.vdi'}} {u'return': {}} -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -21,12 +21,12 @@ cluster_size: 1048576 =20 =3D=3D=3D Successful image creation (explicit defaults) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'preallocation': 'off', 'driver': 'vdi', 'file': {'driver': 'file', 'fil= ename': 'TEST_DIR/PID-t.vdi'}, 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'preallocation': 'off', 'driver': 'vdi', 'file': {'driver': 'file', 'filen= ame': 'TEST_DIR/PID-t.vdi'}, 'size': 67108864}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -40,12 +40,12 @@ cluster_size: 1048576 =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'preallocation': 'metadata', 'driver': 'vdi', 'file': {'driver': 'file',= 'filename': 'TEST_DIR/PID-t.vdi'}, 'size': 33554432}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'preallocation': 'metadata', 'driver': 'vdi', 'file': {'driver': 'file', '= filename': 'TEST_DIR/PID-t.vdi'}, 'size': 33554432}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -60,7 +60,7 @@ cluster_size: 1048576 =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{'execute': 'x-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}}} {u'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': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -80,7 +80,7 @@ cluster_size: 1048576 =20 =3D=3D=3D Maximum size =3D=3D=3D =20 -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -92,19 +92,19 @@ cluster_size: 1048576 =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vdi', 'file': 'node0', 'size': 18446744073709551104L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vdi', 'file': 'node0', 'size': 18446744073709551104L}}} {u'return': {}} Job failed: Unsupported VDI image size (size is 0xfffffffffffffe00, max su= pported is 0x1fffff8000000) {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vdi', 'file': 'node0', 'size': 9223372036854775808L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vdi', 'file': 'node0', 'size': 9223372036854775808L}}} {u'return': {}} Job failed: Unsupported VDI image size (size is 0x8000000000000000, max su= pported is 0x1fffff8000000) {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'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 b/tests/qemu-iotests/212 index 03cf41d133..95c8810d83 100755 --- a/tests/qemu-iotests/212 +++ b/tests/qemu-iotests/212 @@ -27,7 +27,7 @@ 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('x-blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) =20 if 'return' in result: assert result['return'] =3D=3D {} diff --git a/tests/qemu-iotests/212.out b/tests/qemu-iotests/212.out index 780bc30112..9150da7a2c 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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.parallels'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.parallels'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 {'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver'= : 'file', 'filename': 'TEST_DIR/PID-t.parallels'}} {u'return': {}} -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -18,12 +18,12 @@ virtual size: 128M (134217728 bytes) =20 =3D=3D=3D Successful image creation (explicit defaults) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.parallels'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.parallels'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.parallels'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.parallels'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -50,7 +50,7 @@ virtual size: 32M (33554432 bytes) =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{'execute': 'x-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}}} {u'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': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -69,7 +69,7 @@ virtual size: 0 (0 bytes) =20 =3D=3D=3D Maximum size =3D=3D=3D =20 -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -80,31 +80,31 @@ virtual size: 4096T (4503599627369984 bytes) =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{'execute': 'x-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}}} {u'return': {}} Job failed: Image size must be a multiple of 512 bytes {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'parallels', 'file': 'node0', 'size': 18446744073709551104L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'parallels', 'file': 'node0', 'size': 18446744073709551104L}}} {u'return': {}} Job failed: Image size is too large for this cluster size {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'parallels', 'file': 'node0', 'size': 9223372036854775808L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'parallels', 'file': 'node0', 'size': 9223372036854775808L}}} {u'return': {}} Job failed: Image size is too large for this cluster size {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'return': {}} Job failed: Image size is too large for this cluster size {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 1234, 'driver': 'parallels', 'file': 'node0', 'size': 67= 108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 1234, 'driver': 'parallels', 'file': 'node0', 'size': 6710= 8864}}} {u'return': {}} Job failed: Cluster size must be a multiple of 512 bytes {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 128, 'driver': 'parallels', 'file': 'node0', 'size': 671= 08864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 128, 'driver': 'parallels', 'file': 'node0', 'size': 67108= 864}}} {u'return': {}} Job failed: Cluster size must be a multiple of 512 bytes {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 4294967296, 'driver': 'parallels', 'file': 'node0', 'siz= e': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 4294967296, 'driver': 'parallels', 'file': 'node0', 'size'= : 67108864}}} {u'return': {}} Job failed: Cluster size is too large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 9223372036854775808L, 'driver': 'parallels', 'file': 'no= de0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 9223372036854775808L, 'driver': 'parallels', 'file': 'node= 0', 'size': 67108864}}} {u'return': {}} Job failed: Cluster size is too large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 18446744073709551104L, 'driver': 'parallels', 'file': 'n= ode0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 18446744073709551104L, 'driver': 'parallels', 'file': 'nod= e0', 'size': 67108864}}} {u'return': {}} Job failed: Cluster size is too large {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 0, 'driver': 'parallels', 'file': 'node0', 'size': 67108= 864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 0, 'driver': 'parallels', 'file': 'node0', 'size': 6710886= 4}}} {u'return': {}} Job failed: Image size is too large for this cluster size {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'cluster-size': 512, 'driver': 'parallels', 'file': 'node0', 'size': 281= 474976710656}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'cluster-size': 512, 'driver': 'parallels', 'file': 'node0', 'size': 28147= 4976710656}}} {u'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 b/tests/qemu-iotests/213 index 29d25bcee1..4054439e3c 100755 --- a/tests/qemu-iotests/213 +++ b/tests/qemu-iotests/213 @@ -27,7 +27,7 @@ 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('x-blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3Dop= tions) =20 if 'return' in result: assert result['return'] =3D=3D {} diff --git a/tests/qemu-iotests/213.out b/tests/qemu-iotests/213.out index f18a39a4b3..e1dcd47201 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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 {'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver'= : 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}} {u'return': {}} -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -19,12 +19,12 @@ cluster_size: 8388608 =20 =3D=3D=3D Successful image creation (explicit defaults) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'block-size': 8388608, 'driver': 'vhdx', 'subformat': 'dynamic', 'log-si= ze': 1048576, 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}= , 'block-state-zero': True, 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'block-size': 8388608, 'driver': 'vhdx', 'subformat': 'dynamic', 'log-size= ': 1048576, 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}, = 'block-state-zero': True, 'size': 67108864}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -36,12 +36,12 @@ cluster_size: 8388608 =20 =3D=3D=3D Successful image creation (with non-default options) =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'block-size': 268435456, 'driver': 'vhdx', 'subformat': 'fixed', 'log-si= ze': 8388608, 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}= , 'block-state-zero': False, 'size': 33554432}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'block-size': 268435456, 'driver': 'vhdx', 'subformat': 'fixed', 'log-size= ': 8388608, 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vhdx'}, = 'block-state-zero': False, 'size': 33554432}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -53,7 +53,7 @@ cluster_size: 268435456 =20 =3D=3D=3D Invalid BlockdevRef =3D=3D=3D =20 -{'execute': 'x-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}}} {u'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': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -73,7 +73,7 @@ cluster_size: 8388608 =20 =3D=3D=3D Maximum size =3D=3D=3D =20 -{'execute': 'x-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}}} {u'return': {}} {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} @@ -85,25 +85,25 @@ cluster_size: 67108864 =20 =3D=3D=3D Invalid sizes =3D=3D=3D =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vhdx', 'file': 'node0', 'size': 18446744073709551104L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vhdx', 'file': 'node0', 'size': 18446744073709551104L}}} {u'return': {}} Job failed: Image size too large; max of 64TB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vhdx', 'file': 'node0', 'size': 9223372036854775808L}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vhdx', 'file': 'node0', 'size': 9223372036854775808L}}} {u'return': {}} Job failed: Image size too large; max of 64TB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'return': {}} Job failed: Image size too large; max of 64TB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-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}}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vhdx', 'block-size': 1234567, 'file': 'node0', 'size': 671088= 64}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vhdx', 'block-size': 1234567, 'file': 'node0', 'size': 67108864= }}} {u'return': {}} Job failed: Block size must be a multiple of 1 MB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vhdx', 'block-size': 128, 'file': 'node0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vhdx', 'block-size': 128, 'file': 'node0', 'size': 67108864}}} {u'return': {}} Job failed: Block size must be a multiple of 1 MB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vhdx', 'block-size': 3145728, 'file': 'node0', 'size': 671088= 64}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vhdx', 'block-size': 3145728, 'file': 'node0', 'size': 67108864= }}} {u'return': {}} Job failed: Block size must be a power of two {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vhdx', 'block-size': 536870912, 'file': 'node0', 'size': 6710= 8864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vhdx', 'block-size': 536870912, 'file': 'node0', 'size': 671088= 64}}} {u'return': {}} Job failed: Block size must not exceed 268435456 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'driver': 'vhdx', 'block-size': 0, 'file': 'node0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'driver': 'vhdx', 'block-size': 0, 'file': 'node0', 'size': 67108864}}} {u'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': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'log-size': 1234567, 'driver': 'vhdx', 'file': 'node0', 'size': 67108864= }}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'log-size': 1234567, 'driver': 'vhdx', 'file': 'node0', 'size': 67108864}}} {u'return': {}} Job failed: Log size must be a multiple of 1 MB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'log-size': 128, 'driver': 'vhdx', 'file': 'node0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'log-size': 128, 'driver': 'vhdx', 'file': 'node0', 'size': 67108864}}} {u'return': {}} Job failed: Log size must be a multiple of 1 MB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'log-size': 4294967296, 'driver': 'vhdx', 'file': 'node0', 'size': 67108= 864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'log-size': 4294967296, 'driver': 'vhdx', 'file': 'node0', 'size': 6710886= 4}}} {u'return': {}} Job failed: Log size must be smaller than 4 GB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} {u'return': {}} =20 -{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options'= : {'log-size': 0, 'driver': 'vhdx', 'file': 'node0', 'size': 67108864}}} +{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': = {'log-size': 0, 'driver': 'vhdx', 'file': 'node0', 'size': 67108864}}} {u'return': {}} Job failed: Log size must be a multiple of 1 MB {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}} --=20 2.13.6