[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 07/10] block: Add "drained begin/end" for transac
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v7 07/10] block: Add "drained begin/end" for transactional backup |
Date: |
Fri, 23 Oct 2015 11:08:11 +0800 |
This ensures the atomicity of the transaction by avoiding processing of
external requests such as those from ioeventfd.
Move the assignment to state->bs up right after bdrv_drained_begin, so
that we can use it in the clean callback. The abort callback will still
check bs->job and state->job, so it's OK.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
blockdev.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c
index e4a5eb4..0a7848b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1684,9 +1684,16 @@ static void drive_backup_prepare(BlkTransactionState
*common, Error **errp)
return;
}
+ if (!blk_is_available(blk)) {
+ error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, backup->device);
+ return;
+ }
+
/* AioContext is released in .clean() */
state->aio_context = blk_get_aio_context(blk);
aio_context_acquire(state->aio_context);
+ bdrv_drained_begin(blk_bs(blk));
+ state->bs = blk_bs(blk);
qmp_drive_backup(backup->device, backup->target,
backup->has_format, backup->format,
@@ -1702,7 +1709,6 @@ static void drive_backup_prepare(BlkTransactionState
*common, Error **errp)
return;
}
- state->bs = blk_bs(blk);
state->job = state->bs->job;
}
@@ -1722,6 +1728,7 @@ static void drive_backup_clean(BlkTransactionState
*common)
DriveBackupState *state = DO_UPCAST(DriveBackupState, common, common);
if (state->aio_context) {
+ bdrv_drained_end(state->bs);
aio_context_release(state->aio_context);
}
}
--
2.4.3
- [Qemu-block] [PATCH v7 00/10] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 01/10] aio: Add "is_external" flag for event handlers, Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 02/10] nbd: Mark fd handlers client type as "external", Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 03/10] dataplane: Mark host notifiers' client type as "external", Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 04/10] aio: introduce aio_{disable, enable}_external, Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 05/10] block: Introduce "drained begin/end" API, Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 06/10] block: Add "drained begin/end" for transactional external snapshot, Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 07/10] block: Add "drained begin/end" for transactional backup,
Fam Zheng <=
- [Qemu-block] [PATCH v7 08/10] block: Add "drained begin/end" for transactional blockdev-backup, Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 09/10] block: Add "drained begin/end" for internal snapshot, Fam Zheng, 2015/10/22
- [Qemu-block] [PATCH v7 10/10] tests: Add test case for aio_disable_external, Fam Zheng, 2015/10/22
- Re: [Qemu-block] [PATCH v7 00/10] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Kevin Wolf, 2015/10/23
- Re: [Qemu-block] [PATCH v7 00/10] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end, Stefan Hajnoczi, 2015/10/23