[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/44] backup: Extract dirty bitmap handling as a sep
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 13/44] backup: Extract dirty bitmap handling as a separate function |
Date: |
Tue, 10 Nov 2015 14:14:08 +0000 |
From: Fam Zheng <address@hidden>
This will be reused by the coming new transactional completion code.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/backup.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index ec01db8..f7fcb99 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -221,6 +221,22 @@ static void backup_iostatus_reset(BlockJob *job)
}
}
+static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
+{
+ BdrvDirtyBitmap *bm;
+ BlockDriverState *bs = job->common.bs;
+
+ if (ret < 0 || block_job_is_cancelled(&job->common)) {
+ /* Merge the successor back into the parent, delete nothing. */
+ bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
+ assert(bm);
+ } else {
+ /* Everything is fine, delete this bitmap and install the backup. */
+ bm = bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, NULL);
+ assert(bm);
+ }
+}
+
static const BlockJobDriver backup_job_driver = {
.instance_size = sizeof(BackupBlockJob),
.job_type = BLOCK_JOB_TYPE_BACKUP,
@@ -443,16 +459,7 @@ static void coroutine_fn backup_run(void *opaque)
qemu_co_rwlock_unlock(&job->flush_rwlock);
if (job->sync_bitmap) {
- BdrvDirtyBitmap *bm;
- if (ret < 0 || block_job_is_cancelled(&job->common)) {
- /* Merge the successor back into the parent, delete nothing. */
- bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
- assert(bm);
- } else {
- /* Everything is fine, delete this bitmap and install the backup.
*/
- bm = bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, NULL);
- assert(bm);
- }
+ backup_cleanup_sync_bitmap(job, ret);
}
hbitmap_free(job->bitmap);
--
2.5.0
- [Qemu-devel] [PULL 04/44] iscsi: Emulate commands in iscsi_aio_ioctl as iscsi_ioctl, (continued)
- [Qemu-devel] [PULL 04/44] iscsi: Emulate commands in iscsi_aio_ioctl as iscsi_ioctl, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 02/44] block: Track flush requests, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 03/44] block: Track discard requests, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 05/44] block: Add ioctl parameter fields to BlockRequest, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 06/44] block: Emulate bdrv_ioctl with bdrv_aio_ioctl and track both, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 09/44] qed: Implement .bdrv_drain, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 07/44] block: Drop BlockDriver.bdrv_ioctl, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 08/44] block: Introduce BlockDriver.bdrv_drain callback, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 10/44] qapi: Add transaction support to block-dirty-bitmap operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 11/44] iotests: add transactional incremental backup test, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 13/44] backup: Extract dirty bitmap handling as a separate function,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 12/44] block: rename BlkTransactionState and BdrvActionOps, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 14/44] blockjob: Introduce reference count and fix reference to job->bs, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 16/44] blockjob: Add "completed" and "ret" in BlockJob, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 18/44] block: Add block job transactions, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 17/44] blockjob: Simplify block_job_finish_sync, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 15/44] blockjob: Add .commit and .abort block job actions, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 19/44] block/backup: Rely on commit/abort for cleanup, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 20/44] block: Add BlockJobTxn support to backup_run, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 22/44] iotests: 124 - transactional failure test, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 21/44] block: add transactional properties, Stefan Hajnoczi, 2015/11/10