[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 10/14] block/backup: Rely on commit/abort for cl
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v10 10/14] block/backup: Rely on commit/abort for cleanup |
Date: |
Fri, 23 Oct 2015 19:56:48 -0400 |
Switch over to the new .commit/.abort handlers for
cleaning up incremental bitmaps.
[split up from a patch originally by Stefan and Fam. --js]
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: John Snow <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
block/backup.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 8b92ed1..b4534a0 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -234,11 +234,29 @@ static void backup_cleanup_sync_bitmap(BackupBlockJob
*job, int ret)
}
}
+static void backup_commit(BlockJob *job)
+{
+ BackupBlockJob *s = container_of(job, BackupBlockJob, common);
+ if (s->sync_bitmap) {
+ backup_cleanup_sync_bitmap(s, 0);
+ }
+}
+
+static void backup_abort(BlockJob *job)
+{
+ BackupBlockJob *s = container_of(job, BackupBlockJob, common);
+ if (s->sync_bitmap) {
+ backup_cleanup_sync_bitmap(s, -1);
+ }
+}
+
static const BlockJobDriver backup_job_driver = {
.instance_size = sizeof(BackupBlockJob),
.job_type = BLOCK_JOB_TYPE_BACKUP,
.set_speed = backup_set_speed,
.iostatus_reset = backup_iostatus_reset,
+ .commit = backup_commit,
+ .abort = backup_abort,
};
static BlockErrorAction backup_error_action(BackupBlockJob *job,
@@ -452,10 +470,6 @@ static void coroutine_fn backup_run(void *opaque)
/* wait until pending backup_do_cow() calls have completed */
qemu_co_rwlock_wrlock(&job->flush_rwlock);
qemu_co_rwlock_unlock(&job->flush_rwlock);
-
- if (job->sync_bitmap) {
- backup_cleanup_sync_bitmap(job, ret);
- }
hbitmap_free(job->bitmap);
bdrv_iostatus_disable(target);
--
2.4.3
- [Qemu-devel] [PATCH v10 04/14] backup: Extract dirty bitmap handling as a separate function, (continued)
- [Qemu-devel] [PATCH v10 04/14] backup: Extract dirty bitmap handling as a separate function, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 02/14] iotests: add transactional incremental backup test, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 05/14] blockjob: Introduce reference count and fix reference to job->bs, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 01/14] qapi: Add transaction support to block-dirty-bitmap operations, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 06/14] blockjob: Add .commit and .abort block job actions, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 07/14] blockjob: Add "completed" and "ret" in BlockJob, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 03/14] block: rename BlkTransactionState and BdrvActionOps, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 08/14] blockjob: Simplify block_job_finish_sync, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 09/14] block: Add block job transactions, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 13/14] iotests: 124 - transactional failure test, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 10/14] block/backup: Rely on commit/abort for cleanup,
John Snow <=
- [Qemu-devel] [PATCH v10 11/14] block: Add BlockJobTxn support to backup_run, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 14/14] tests: add BlockJobTxn unit test, John Snow, 2015/10/23
- [Qemu-devel] [PATCH v10 12/14] block: add transactional properties, John Snow, 2015/10/23