The following changes since commit 7b1db0908d88f0c9cfac24e214ff72a860692e23:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180323' into staging (2018-03-25 13:51:33 +0100)

are available in the git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 0b7e7f66813a7e346e12d47be977a32a530a6316:

qemu-iotests: Test vhdx image creation with QMP (2018-03-26 12:17:43 +0200)

Alberto Garcia (1):

qcow2: Reset free_cluster_index when allocating a new refcount block

Eric Blake (1):

iotests: 163 is not quick

Fabiano Rosas (5):

block/replication: Remove protocol_name field

block/quorum: Remove protocol-related fields

block/throttle: Remove protocol-related fields

block/blkreplay: Remove protocol-related fields

include/block/block_int: Document protocol related functions

Kevin Wolf (12):

vdi: Change 'static' create option to 'preallocation' in QMP

vdi: Fix build with CONFIG_VDI_DEBUG

qemu-iotests: Test vdi image creation with QMP

qemu-iotests: Enable 025 for luks

luks: Turn another invalid assertion into check

qemu-iotests: Test invalid resize on luks

parallels: Check maximum cluster size on create

qemu-iotests: Test parallels image creation with QMP

vhdx: Require power-of-two block size on create

vhdx: Don't use error_setg_errno() with constant errno

vhdx: Check for 4 GB maximum log size on creation

qemu-iotests: Test vhdx image creation with QMP

qapi/block-core.json | 7 +-

include/block/block_int.h | 8 ++

replication.h | 1 -

block/blkreplay.c | 3 +-

block/crypto.c | 6 +-

block/parallels.c | 5 +

block/qcow2-refcount.c | 7 +

block/quorum.c | 3 +-

block/replication.c | 1 -

block/throttle.c | 3 +-

block/vdi.c | 46 ++++--

block/vhdx.c | 17 ++-

tests/qemu-iotests/025 | 9 +-

tests/qemu-iotests/026.out | 6 +-

tests/qemu-iotests/121 | 20 +++

tests/qemu-iotests/121.out | 10 ++

tests/qemu-iotests/210 | 37 +++++

tests/qemu-iotests/210.out | 16 +++

tests/qemu-iotests/211 | 246 ++++++++++++++++++++++++++++++++

tests/qemu-iotests/211.out | 97 +++++++++++++

tests/qemu-iotests/212 | 326 ++++++++++++++++++++++++++++++++++++++++++

tests/qemu-iotests/212.out | 111 ++++++++++++++

tests/qemu-iotests/213 | 349 +++++++++++++++++++++++++++++++++++++++++++++

tests/qemu-iotests/213.out | 121 ++++++++++++++++

tests/qemu-iotests/group | 5 +-

25 files changed, 1423 insertions(+), 37 deletions(-)

create mode 100755 tests/qemu-iotests/211

create mode 100644 tests/qemu-iotests/211.out

create mode 100755 tests/qemu-iotests/212

create mode 100644 tests/qemu-iotests/212.out

create mode 100755 tests/qemu-iotests/213

create mode 100644 tests/qemu-iotests/213.out

From: Fabiano Rosas <farosas@linux.vnet.ibm.com>

The throttle driver is not a protocol so it should implement bdrv_open

instead of bdrv_file_open and not provide a protocol_name.

Attempts to invoke this driver using protocol syntax

(i.e. throttle:<filename:options:...>) will now fail gracefully:

$ qemu-img info throttle:foo

qemu-img: Could not open 'throttle:foo': Unknown protocol 'throttle'

Signed-off-by: Fabiano Rosas <farosas@linux.vnet.ibm.com>

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

Reviewed-by: Alberto Garcia <berto@igalia.com>

block/throttle.c | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/throttle.c b/block/throttle.c

--- a/block/throttle.c

+++ b/block/throttle.c

@@ -XXX,XX +XXX,XX @@ static void coroutine_fn throttle_co_drain_end(BlockDriverState *bs)

static BlockDriver bdrv_throttle = {

.format_name = "throttle",

- .protocol_name = "throttle",

.instance_size = sizeof(ThrottleGroupMember),

- .bdrv_file_open = throttle_open,

+ .bdrv_open = throttle_open,

.bdrv_close = throttle_close,

.bdrv_co_flush = throttle_co_flush,

2.13.6

From: Fabiano Rosas <farosas@linux.vnet.ibm.com>

The blkreplay driver is not a protocol so it should implement bdrv_open

instead of bdrv_file_open and not provide a protocol_name.

Attempts to invoke this driver using protocol syntax

(i.e. blkreplay:<filename:options:...>) will now fail gracefully:

$ qemu-img info blkreplay:foo

qemu-img: Could not open 'blkreplay:foo': Unknown protocol 'blkreplay'

Signed-off-by: Fabiano Rosas <farosas@linux.vnet.ibm.com>

Reviewed-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>

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

block/blkreplay.c | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/blkreplay.c b/block/blkreplay.c

index XXXXXXX..XXXXXXX 100755

--- a/block/blkreplay.c

+++ b/block/blkreplay.c

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn blkreplay_co_flush(BlockDriverState *bs)

static BlockDriver bdrv_blkreplay = {

.format_name = "blkreplay",

- .protocol_name = "blkreplay",

.instance_size = 0,

- .bdrv_file_open = blkreplay_open,

+ .bdrv_open = blkreplay_open,

.bdrv_close = blkreplay_close,

.bdrv_child_perm = bdrv_filter_default_perms,

.bdrv_getlength = blkreplay_getlength,

2.13.6

From: Fabiano Rosas <farosas@linux.vnet.ibm.com>

Clarify that:

- for protocols the brdv_file_open function is used instead

of bdrv_open;

- when protocol_name is set, a driver should expect

to be given only a filename and no other options.

Signed-off-by: Fabiano Rosas <farosas@linux.vnet.ibm.com>

include/block/block_int.h | 8 ++++++++

1 file changed, 8 insertions(+)

diff --git a/include/block/block_int.h b/include/block/block_int.h

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -XXX,XX +XXX,XX @@ struct BlockDriver {

int (*bdrv_open)(BlockDriverState *bs, QDict *options, int flags,

Error **errp);

+

+ /* Protocol drivers should implement this instead of bdrv_open */

int (*bdrv_file_open)(BlockDriverState *bs, QDict *options, int flags,

Error **errp);

void (*bdrv_close)(BlockDriverState *bs);

@@ -XXX,XX +XXX,XX @@ struct BlockDriver {

*/

int coroutine_fn (*bdrv_co_flush_to_os)(BlockDriverState *bs);

+ /*

+ * Drivers setting this field must be able to work with just a plain

+ * filename with '<protocol_name>:' as a prefix, and no other options.

+ * Options may be extracted from the filename by implementing

+ * bdrv_parse_filename.

+ */

const char *protocol_name;

int (*bdrv_truncate)(BlockDriverState *bs, int64_t offset,

PreallocMode prealloc, Error **errp);

2.13.6

From: Eric Blake <eblake@redhat.com>

Testing on ext4, most 'quick' qcow2 tests took less than 5 seconds,

but 163 took more than 20. Let's remove it from the quick set.

Signed-off-by: Eric Blake <eblake@redhat.com>

tests/qemu-iotests/group | 2 +-

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

--- a/tests/qemu-iotests/group

+++ b/tests/qemu-iotests/group

@@ -XXX,XX +XXX,XX @@

159 rw auto quick

160 rw auto quick

162 auto quick

-163 rw auto quick

+163 rw auto

165 rw auto quick

169 rw auto quick

170 rw auto quick

2.13.6

It's unclear what the real maximum is, but we use an uint32_t to store

the log size in vhdx_co_create(), so we should check that the given

value fits in 32 bits.

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

block/vhdx.c | 4 ++++

1 file changed, 4 insertions(+)

diff --git a/block/vhdx.c b/block/vhdx.c

--- a/block/vhdx.c

+++ b/block/vhdx.c

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,

if (!vhdx_opts->has_log_size) {

log_size = DEFAULT_LOG_SIZE;

} else {

+ if (vhdx_opts->log_size > UINT32_MAX) {

+ error_setg(errp, "Log size must be smaller than 4 GB");

+ return -EINVAL;

log_size = vhdx_opts->log_size;

}

if (log_size < MiB || (log_size % MiB) != 0) {

2.13.6

error_setg_errno() is meant for cases where we got an errno from the OS

that can add useful extra information to an error message. It's

pointless if we pass a constant errno, these cases should use plain

error_setg().

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

block/vhdx.c | 9 ++++-----

1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/block/vhdx.c b/block/vhdx.c

--- a/block/vhdx.c

+++ b/block/vhdx.c

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,

/* Validate options and set default values */

image_size = vhdx_opts->size;

if (image_size > VHDX_MAX_IMAGE_SIZE) {

- error_setg_errno(errp, EINVAL, "Image size too large; max of 64TB");

+ error_setg(errp, "Image size too large; max of 64TB");

return -EINVAL;

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,

log_size = vhdx_opts->log_size;