From 53c3256f19482b02a18c9402908df39ec498fdef Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Tue, 26 Jun 2018 09:48:52 +0200

Subject: [PATCH 144/268] block/create: Mark blockdev-create stable

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20180626094856.6924-70-kwolf@redhat.com>

Patchwork-id: 81104

O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 69/73] block/create: Mark blockdev-create stable

Bugzilla: 1513543

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Fam Zheng <famz@redhat.com>

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 <kwolf@redhat.com>

Reviewed-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

(cherry picked from commit 3fb588a0f2c006122c34e1960a15c87ae2b927eb)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/create.c             |  4 ++--

 qapi/block-core.json       |  4 ++--

 qapi/job.json              |  2 +-

 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/block/create.c b/block/create.c

index 1a263e4..915cd41 100644

--- a/block/create.c

+++ b/block/create.c

@@ -63,8 +63,8 @@ static const JobDriver blockdev_create_job_driver = {

     .start         = blockdev_create_run,

 };

-void qmp_x_blockdev_create(const char *job_id, BlockdevCreateOptions *options,

-                           Error **errp)

+void qmp_blockdev_create(const char *job_id, BlockdevCreateOptions *options,

+                         Error **errp)

 {

     BlockdevCreateJob *s;

     const char *fmt = BlockdevDriver_str(options->driver);

diff --git a/qapi/block-core.json b/qapi/block-core.json

index 050fbf3..b0f41f1 100644

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -4025,7 +4025,7 @@

   } }

 ##

-# @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.

@@ -4036,7 +4036,7 @@

 #

 # Since: 3.0

 ##

-{ 'command': 'x-blockdev-create',

+{ 'command': 'blockdev-create',

   'data': { 'job-id': 'str',

             'options': 'BlockdevCreateOptions' } }

diff --git a/qapi/job.json b/qapi/job.json

index 69c1970..17d1003 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/tests/qemu-iotests/206 b/tests/qemu-iotests/206

index b8cf2e7..128c334 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=['qcow2'])

 def blockdev_create(vm, options):

-    result = vm.qmp_log('x-blockdev-create', job_id='job0', options=options)

+    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)

     if 'return' in result:

         assert result['return'] == {}

diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out

index 34451a3..789eebe 100644

--- a/tests/qemu-iotests/206.out

+++ b/tests/qemu-iotests/206.out

@@ -1,13 +1,13 @@

 === Successful image creation (defaults) ===

-{'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': {}}

 {'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:

 === Successful image creation (inline blockdev-add, explicit defaults) ===

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'nocow': False, 'preallocation': 'off', 'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'nocow': False, 'preallocation': 'off', 'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}

 {u'return': {}}

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 65536, 'refcount-bits': 16, 'version': 'v3', 'preallocation': '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', 'preallocation': '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:

 === Successful image creation (v3 non-default options) ===

-{'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', 'filename': 'TEST_DIR/PID-t.qcow2'}}}

 {u'return': {}}

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 2097152, 'refcount-bits': 1, 'version': 'v3', 'preallocation': 'metadata', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'lazy-refcounts': True, 'driver': 'qcow2', 'size': 33554432}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 2097152, 'refcount-bits': 1, 'version': 'v3', 'preallocation': 'metadata', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'lazy-refcounts': True, 'driver': 'qcow2', 'size': 33554432}}}

 {u'return': {}}

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

@@ -68,12 +68,12 @@ Format specific information:

 === Successful image creation (v2 non-default options) ===

-{'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': {}}

-{'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'}, 'backing-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'}, 'backing-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:

 === Successful image creation (encrypted) ===

-{'execute': 'x-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': {'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': {'driver': '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:

 === Invalid BlockdevRef ===

-{'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=this doesn't exist nor node_name=this doesn't exist

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

 === Invalid sizes ===

-{'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': {}}

-{'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': {}}

-{'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': {}}

-{'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': {}}

 === Invalid version ===

-{'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'"}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'lazy-refcounts': True, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0', '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=v3 or greater)

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'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 level 1.1 or above (use version=v3 or greater)

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

 === Invalid backing file options ===

-{'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': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'backing-fmt': 'qcow2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'backing-fmt': 'qcow2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

 {u'return': {}}

 Job failed: Backing format cannot be used without backing file

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

 === Invalid cluster size ===

-{'execute': 'x-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}}}

 {u'return': {}}

 Job failed: Cluster size must be a power of two between 512 and 2048k

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'execute': 'x-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}}}

 {u'return': {}}

 Job failed: Cluster size must be a power of two between 512 and 2048k

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 4194304, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 4194304, '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': {}}

-{'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': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 512, 'driver': 'qcow2', 'file': 'node0', 'size': 281474976710656}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 512, 'driver': 'qcow2', 'file': 'node0', 'size': 281474976710656}}}

 {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': {}}

 === Invalid refcount width ===

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}

+{'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 bits

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'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 bits

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'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 bits

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207

index b595c92..444ae23 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)

 def blockdev_create(vm, options):

-    result = vm.qmp_log('x-blockdev-create', job_id='job0', options=options,

+    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,

                         filters=[iotests.filter_testfiles, filter_hash])

     if 'return' in result:

diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out

index 5eee17b..078b7e6 100644

--- a/tests/qemu-iotests/207.out

+++ b/tests/qemu-iotests/207.out

@@ -1,6 +1,6 @@

 === Successful image creation (defaults) ===

-{'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': {'host': '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)

 === Test host-key-check options ===

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.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-check': {'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)

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'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-check': {'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)

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'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-check': {'hash': 'wrong', 'type': 'md5', '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': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.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-check': {'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)

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'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-check': {'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': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'sha1', 'mode': 'hash'}, '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-check': {'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)

 === Invalid path and user ===

-{'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', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

 {u'return': {}}

 Job failed: failed to open remote file '/this/is/not/an/existing/path': Failed opening remote file (libssh2 error code: -31)

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'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-check': {'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 ff4fdde..d142841 100755

--- a/tests/qemu-iotests/210

+++ b/tests/qemu-iotests/210

@@ -27,7 +27,7 @@ iotests.verify_image_format(supported_fmts=['luks'])

 iotests.verify_protocol(supported=['file'])

 def blockdev_create(vm, options):

-    result = vm.qmp_log('x-blockdev-create', job_id='job0', options=options)

+    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)

     if 'return' in result:

         assert result['return'] == {}

diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out

index 0e6e5c0..078ba54 100644

--- a/tests/qemu-iotests/210.out

+++ b/tests/qemu-iotests/210.out

@@ -1,13 +1,13 @@

 === Successful image creation (defaults) ===

-{'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': {}}

 {'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': 'imgfile', 'size': 134217728}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'imgfile', 'size': 134217728}}}

 {u'return': {}}

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

@@ -54,12 +54,12 @@ Format specific information:

 === Successful image creation (with non-default options) ===

-{'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': {}}

-{'execute': 'x-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}}}

+{'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:

 === Invalid BlockdevRef ===

-{'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=this doesn't exist nor node_name=this doesn't exist

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

@@ -114,7 +114,7 @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi

 === Zero size ===

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'node0', '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:

 === Invalid sizes ===

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 18446744073709551104L}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 18446744073709551104L}}}

 {u'return': {}}

 Job failed: The requested file size is too large

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775808L}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775808L}}}

 {u'return': {}}

 Job failed: The requested file size is too large

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775296}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775296}}}

 {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 b45f886..7b7985d 100755

--- a/tests/qemu-iotests/211

+++ b/tests/qemu-iotests/211

@@ -27,7 +27,7 @@ iotests.verify_image_format(supported_fmts=['vdi'])

 iotests.verify_protocol(supported=['file'])

 def blockdev_create(vm, options):

-    result = vm.qmp_log('x-blockdev-create', job_id='job0', options=options)

+    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)

     if 'return' in result:

         assert result['return'] == {}

diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out

index 2bf1c4a..6feaea3 100644

--- a/tests/qemu-iotests/211.out

+++ b/tests/qemu-iotests/211.out

@@ -1,13 +1,13 @@

 === Successful image creation (defaults) ===

-{'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': {}}

 {'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

 === Successful image creation (explicit defaults) ===

-{'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': {}}

-{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'preallocation': 'off', 'driver': 'vdi', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}, 'size': 67108864}}}

+{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'preallocation': 'off', 'driver': 'vdi', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.vdi'}, 'size': 67108864}}}

 {u'return': {}}

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

@@ -40,12 +40,12 @@ cluster_size: 1048576

 === Successful image creation (with non-default options) ===

-{'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': {}}

-{'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

 === Invalid BlockdevRef ===

-{'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=this doesn't exist nor node_name=this doesn't exist

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

@@ -68,7 +68,7 @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi

 === Zero size ===

-{'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

 === Maximum size ===

-{'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

 === Invalid sizes ===

-{'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 supported is 0x1fffff8000000)

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'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 supported is 0x1fffff8000000)

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

 {u'return': {}}

-{'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 supported is 0x1fffff8000000)

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212

index 03cf41d..95c8810 100755

--- a/tests/qemu-iotests/212

+++ b/tests/qemu-iotests/212

@@ -27,7 +27,7 @@ iotests.verify_image_format(supported_fmts=['parallels'])

 iotests.verify_protocol(supported=['file'])

 def blockdev_create(vm, options):

-    result = vm.qmp_log('x-blockdev-create', job_id='job0', options=options)

+    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)

     if 'return' in result:

         assert result['return'] == {}

diff --git a/tests/qemu-iotests/212.out b/tests/qemu-iotests/212.out

index 780bc30..9150da7 100644

--- a/tests/qemu-iotests/212.out

+++ b/tests/qemu-iotests/212.out

@@ -1,13 +1,13 @@

 === Successful image creation (defaults) ===

-{'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': {}}

 {'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)

 === Successful image creation (explicit defaults) ===

-{'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': {}}

-{'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)

 === Successful image creation (with non-default options) ===

-{'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': {}}

-{'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)

 === Invalid BlockdevRef ===

-{'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=this doesn't exist nor node_name=this doesn't exist

 {'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

@@ -58,7 +58,7 @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi

 === Zero size ===

-{'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)

 === Maximum size ===

-{'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)

 === Invalid sizes ===

-{'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': {}}

-{'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': {}}

-{'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': {}}

-{'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': {}}