[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/37] block: Add "drained begin/end" for transaction
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 35/37] block: Add "drained begin/end" for transactional blockdev-backup |
Date: |
Fri, 23 Oct 2015 19:01:22 +0200 |
From: Fam Zheng <address@hidden>
Similar to the previous patch, make sure that external events are not
dispatched during transaction operations.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c
index 0a7848b..52f44b2 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1756,6 +1756,11 @@ static void blockdev_backup_prepare(BlkTransactionState
*common, Error **errp)
return;
}
+ if (!blk_is_available(blk)) {
+ error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, backup->device);
+ return;
+ }
+
target = blk_by_name(backup->target);
if (!target) {
error_setg(errp, "Device '%s' not found", backup->target);
@@ -1770,6 +1775,8 @@ static void blockdev_backup_prepare(BlkTransactionState
*common, Error **errp)
return;
}
aio_context_acquire(state->aio_context);
+ state->bs = blk_bs(blk);
+ bdrv_drained_begin(state->bs);
qmp_blockdev_backup(backup->device, backup->target,
backup->sync,
@@ -1782,7 +1789,6 @@ static void blockdev_backup_prepare(BlkTransactionState
*common, Error **errp)
return;
}
- state->bs = blk_bs(blk);
state->job = state->bs->job;
}
@@ -1802,6 +1808,7 @@ static void blockdev_backup_clean(BlkTransactionState
*common)
BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common,
common);
if (state->aio_context) {
+ bdrv_drained_end(state->bs);
aio_context_release(state->aio_context);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 25/37] blockdev: Pull out blockdev option extraction, (continued)
- [Qemu-devel] [PULL 25/37] blockdev: Pull out blockdev option extraction, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 31/37] aio: introduce aio_{disable, enable}_external, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 26/37] blockdev: Allow more options for BB-less BDS tree, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 20/37] block: Fail requests to empty BlockBackend, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 24/37] blockdev: Do not create BDS for empty drive, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 30/37] dataplane: Mark host notifiers' client type as "external", Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 28/37] aio: Add "is_external" flag for event handlers, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 33/37] block: Add "drained begin/end" for transactional external snapshot, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 36/37] block: Add "drained begin/end" for internal snapshot, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 27/37] throttle: Remove throttle_group_lock/unlock(), Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 35/37] block: Add "drained begin/end" for transactional blockdev-backup,
Kevin Wolf <=
- [Qemu-devel] [PULL 29/37] nbd: Mark fd handlers client type as "external", Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 32/37] block: Introduce "drained begin/end" API, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 37/37] tests: Add test case for aio_disable_external, Kevin Wolf, 2015/10/23
- [Qemu-devel] [PULL 34/37] block: Add "drained begin/end" for transactional backup, Kevin Wolf, 2015/10/23
- Re: [Qemu-devel] [PULL 00/37] Block layer patches, Peter Maydell, 2015/10/26