[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 11/12] blockdev: Check @replaces in blockdev_mirror_c
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 11/12] blockdev: Check @replaces in blockdev_mirror_common |
Date: |
Tue, 19 Mar 2019 16:46:19 +0100 |
From: Max Reitz <address@hidden>
There is no reason why the constraints we put on @replaces should be
limited to drive-mirror. Therefore, move the sanity checks from
qmp_drive_mirror() to blockdev_mirror_common() so they apply to
blockdev-mirror as well.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 55 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 53df2eb875..4775a07d93 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3756,6 +3756,39 @@ static void blockdev_mirror_common(const char *job_id,
BlockDriverState *bs,
sync = MIRROR_SYNC_MODE_FULL;
}
+ if (has_replaces) {
+ BlockDriverState *to_replace_bs;
+ AioContext *replace_aio_context;
+ int64_t bs_size, replace_size;
+
+ bs_size = bdrv_getlength(bs);
+ if (bs_size < 0) {
+ error_setg_errno(errp, -bs_size, "Failed to query device's size");
+ return;
+ }
+
+ to_replace_bs = check_to_replace_node(bs, replaces, errp);
+ if (!to_replace_bs) {
+ return;
+ }
+
+ replace_aio_context = bdrv_get_aio_context(to_replace_bs);
+ aio_context_acquire(replace_aio_context);
+ replace_size = bdrv_getlength(to_replace_bs);
+ aio_context_release(replace_aio_context);
+
+ if (replace_size < 0) {
+ error_setg_errno(errp, -replace_size,
+ "Failed to query the replacement node's size");
+ return;
+ }
+ if (bs_size != replace_size) {
+ error_setg(errp, "cannot replace image with a mirror image of "
+ "different size");
+ return;
+ }
+ }
+
/* pass the node name to replace to mirror start since it's loose coupling
* and will allow to check whether the node still exist at mirror
completion
*/
@@ -3816,33 +3849,11 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
}
if (arg->has_replaces) {
- BlockDriverState *to_replace_bs;
- AioContext *replace_aio_context;
- int64_t replace_size;
-
if (!arg->has_node_name) {
error_setg(errp, "a node-name must be provided when replacing a"
" named node of the graph");
goto out;
}
-
- to_replace_bs = check_to_replace_node(bs, arg->replaces, &local_err);
-
- if (!to_replace_bs) {
- error_propagate(errp, local_err);
- goto out;
- }
-
- replace_aio_context = bdrv_get_aio_context(to_replace_bs);
- aio_context_acquire(replace_aio_context);
- replace_size = bdrv_getlength(to_replace_bs);
- aio_context_release(replace_aio_context);
-
- if (size != replace_size) {
- error_setg(errp, "cannot replace image with a mirror image of "
- "different size");
- goto out;
- }
}
if (arg->mode == NEW_IMAGE_MODE_ABSOLUTE_PATHS) {
--
2.20.1
- [Qemu-block] [PULL 01/12] mirror: Confirm we're quiesced only if the job is paused or cancelled, (continued)
- [Qemu-block] [PULL 01/12] mirror: Confirm we're quiesced only if the job is paused or cancelled, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 06/12] iotests: 153: Wait for an answer to QMP commands, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 05/12] block: Silence Coverity in bdrv_drop_intermediate(), Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 07/12] vl: Fix to create migration object before block backends again, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 02/12] qcow2: Fix data file error condition in qcow2_co_create(), Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 04/12] vmdk: Support version=3 in VMDK descriptor files, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 09/12] blockjob: fix user pause in block_job_error_action, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 08/12] qemu-iotests: Fix 232 for non-qcow2, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 12/12] qemu-iotests: Treat custom TEST_DIR in 051, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 10/12] block: Make bdrv_{copy_on_read, crypto_luks, replication} static, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 11/12] blockdev: Check @replaces in blockdev_mirror_common,
Kevin Wolf <=
- Re: [Qemu-block] [PULL 00/12] Block layer patches, Peter Maydell, 2019/03/19