[PULL,03/12] blockdev-backup: Don't move target AioContext if it's attached

Commit Message

Stefan Hajnoczi June 7, 2016, 2:26 p.m. UTC

From: Fam Zheng <[e-mail]>

If the BDS is attached, it will want to stay on the AioContext where its
BlockBackend is. Don't call bdrv_set_aio_context in this case.

Signed-off-by: Fam Zheng <[e-mail]>
Message-id: [e-mail]
Signed-off-by: Stefan Hajnoczi <[e-mail]>
---
 blockdev.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Patch

diff --git a/blockdev.c b/blockdev.c
index ea7f397..6ccb8e1 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3371,7 +3371,17 @@  void do_blockdev_backup(const char *device, const char *target,
         goto out;
     }
 
-    bdrv_set_aio_context(target_bs, aio_context);
+    if (bdrv_get_aio_context(target_bs) != aio_context) {
+        if (!bdrv_has_blk(target_bs)) {
+            /* The target BDS is not attached, we can safely move it to another
+             * AioContext. */
+            bdrv_set_aio_context(target_bs, aio_context);
+        } else {
+            error_setg(errp, "Target is attached to a different thread from "
+                             "source.");
+            goto out;
+        }
+    }
     backup_start(bs, target_bs, speed, sync, NULL, on_source_error,
                  on_target_error, block_job_cb, bs, txn, &local_err);
     if (local_err != NULL) {