Commit 3fb588a0 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block/create: Mark blockdev-create stable 



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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
parent 0c46a69a

block/create.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static const JobDriver blockdev_create_job_driver = { 
    .start         = blockdev_create_run,

};



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

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

                         Error **errp)

{

    BlockdevCreateJob *s;

qapi/block-core.json

+2 −2
Original line number Diff line number Diff line
@@ -4011,7 +4011,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.
@@ -4022,7 +4022,7 @@ 
#

# Since: 3.0

##

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

{ 'command': 'blockdev-create',

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

            'options': 'BlockdevCreateOptions' } }

qapi/job.json

+1 −1
Original line number Diff line number Diff line
@@ -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

##

tests/qemu-iotests/206

+1 −1
Original line number Diff line number Diff line
@@ -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'] == {}

tests/qemu-iotests/206.out

+27 −27
Original line number Diff line number Diff line 
=== 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'}}