[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/44] block/backup: Rely on commit/abort for cleanup
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 19/44] block/backup: Rely on commit/abort for cleanup |
Date: |
Tue, 10 Nov 2015 14:14:14 +0000 |
From: John Snow <address@hidden>
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>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/backup.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index f7fcb99..a80800f 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -237,11 +237,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,
@@ -457,10 +475,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);
if (target->blk) {
--
2.5.0
- [Qemu-devel] [PULL 08/44] block: Introduce BlockDriver.bdrv_drain callback, (continued)
- [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, 2015/11/10
- [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 <=
- [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
- [Qemu-devel] [PULL 23/44] tests: add BlockJobTxn unit test, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 25/44] ide: Account for write operations correctly, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 24/44] xen_disk: Account for flush operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 26/44] block: define 'clock_type' for the accounting code, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 27/44] util: Infrastructure for computing recent averages, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 28/44] block: Add idle_time_ns to BlockDeviceStats, Stefan Hajnoczi, 2015/11/10