summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2018-02-07 17:29:20 +0100
committerKevin Wolf <kwolf@redhat.com>2018-02-13 12:27:17 +0100
commitcb2af9176fcb6b0b71bbac8c83498c4caa37ab05 (patch)
treed0200c3d14e51beb9df7d675fbbe102a5eab7af6
parentde7269d293bc3a7fba98a0f12781eccb4ea4be1e (diff)
downloadfocaccia-qemu-cb2af9176fcb6b0b71bbac8c83498c4caa37ab05.tar.gz
focaccia-qemu-cb2af9176fcb6b0b71bbac8c83498c4caa37ab05.zip
block: early check for blockers on drive-mirror
Even if an op blocker is present for BLOCK_OP_TYPE_MIRROR_SOURCE,
it is checked a bit late and the result is that the target is
created even if drive-mirror subsequently fails.  Add an early
check to avoid this.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--blockdev.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/blockdev.c b/blockdev.c
index bdbdeae7e4..7423c5317b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3569,6 +3569,11 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
         return;
     }
 
+    /* Early check to avoid creating target */
+    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_MIRROR_SOURCE, errp)) {
+        return;
+    }
+
     aio_context = bdrv_get_aio_context(bs);
     aio_context_acquire(aio_context);