[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/11] blockdev: Check @replaces in blockdev_mirror_
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 02/11] blockdev: Check @replaces in blockdev_mirror_common |
Date: |
Thu, 9 Aug 2018 23:37:52 +0200 |
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>
---
blockdev.c | 55 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 9b143d9e72..2d61588a9a 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3644,6 +3644,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
*/
@@ -3704,33 +3737,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.17.1
- [Qemu-devel] [PATCH 00/11] block: Deal with filters, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 01/11] block: Mark commit and mirror as filter drivers, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 02/11] blockdev: Check @replaces in blockdev_mirror_common,
Max Reitz <=
- [Qemu-devel] [PATCH 05/11] block: Fix check_to_replace_node(), Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 06/11] iotests: Add tests for mirror @replaces loops, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 07/11] block: Leave BDS.backing_file constant, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 04/11] block: Storage child access function, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 08/11] iotests: Add filter commit test cases, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 03/11] block: Filtered children access functions, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 09/11] iotests: Add filter mirror test cases, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 10/11] iotests: Add test for commit in sub directory, Max Reitz, 2018/08/09
- [Qemu-devel] [PATCH 11/11] iotests: Test committing to overridden backing, Max Reitz, 2018/08/09
- Re: [Qemu-devel] [PATCH 00/11] block: Deal with filters, Max Reitz, 2018/08/09