Commit 62a2b55e authored Mar 26, 2018 by Peter Maydell

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging



Block layer patches

# gpg: Signature made Mon 26 Mar 2018 15:33:01 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qemu-iotests: Test vhdx image creation with QMP
  vhdx: Check for 4 GB maximum log size on creation
  vhdx: Don't use error_setg_errno() with constant errno
  vhdx: Require power-of-two block size on create
  qemu-iotests: Test parallels image creation with QMP
  parallels: Check maximum cluster size on create
  qemu-iotests: Test invalid resize on luks
  luks: Turn another invalid assertion into check
  qemu-iotests: Enable 025 for luks
  qemu-iotests: Test vdi image creation with QMP
  vdi: Fix build with CONFIG_VDI_DEBUG
  vdi: Change 'static' create option to 'preallocation' in QMP
  qcow2: Reset free_cluster_index when allocating a new refcount block
  include/block/block_int: Document protocol related functions
  block/blkreplay: Remove protocol-related fields
  block/throttle: Remove protocol-related fields
  block/quorum: Remove protocol-related fields
  block/replication: Remove protocol_name field
  iotests: 163 is not quick

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents 7b93d78a 0b7e7f66

block/blkreplay.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -129,10 +129,9 @@ 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,

block/crypto.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -357,7 +357,11 @@ static int block_crypto_truncate(BlockDriverState *bs, int64_t offset,
		BlockCrypto *crypto = bs->opaque;
		uint64_t payload_offset =
		qcrypto_block_get_payload_offset(crypto->block);
		assert(payload_offset < (INT64_MAX - offset));

		if (payload_offset > INT64_MAX - offset) {
		error_setg(errp, "The requested file size is too large");
		return -EFBIG;
		}

		offset += payload_offset;

block/parallels.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -526,6 +526,11 @@ static int coroutine_fn parallels_co_create(BlockdevCreateOptions* opts,
		cl_size = DEFAULT_CLUSTER_SIZE;
		}

		/* XXX What is the real limit here? This is an insanely large maximum. */
		if (cl_size >= INT64_MAX / MAX_PARALLELS_IMAGE_FACTOR) {
		error_setg(errp, "Cluster size is too large");
		return -EINVAL;
		}
		if (total_size >= MAX_PARALLELS_IMAGE_FACTOR * cl_size) {
		error_setg(errp, "Image size is too large for this cluster size");
		return -E2BIG;

block/qcow2-refcount.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -839,6 +839,13 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
		qcow2_cache_put(s->refcount_block_cache, &refcount_block);
		}
		ret = alloc_refcount_block(bs, cluster_index, &refcount_block);
		/* If the caller needs to restart the search for free clusters,
		* try the same ones first to see if they're still free. */
		if (ret == -EAGAIN) {
		if (s->free_cluster_index > (start >> s->cluster_bits)) {
		s->free_cluster_index = (start >> s->cluster_bits);
		}
		}
		if (ret < 0) {
		goto fail;
		}

block/quorum.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1098,11 +1098,10 @@ static void quorum_refresh_filename(BlockDriverState bs, QDict options)

		static BlockDriver bdrv_quorum = {
		.format_name = "quorum",
		.protocol_name = "quorum",

		.instance_size = sizeof(BDRVQuorumState),

		.bdrv_file_open = quorum_open,
		.bdrv_open = quorum_open,
		.bdrv_close = quorum_close,
		.bdrv_refresh_filename = quorum_refresh_filename,