[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] block: keep bitmap if incremental backup job
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 04/10] block: keep bitmap if incremental backup job is cancelled |
Date: |
Thu, 25 Jun 2015 13:12:06 +0100 |
Reclaim the dirty bitmap if an incremental backup block job is
cancelled. The ret variable may be 0 when the job is cancelled so it's
not enough to check ret < 0.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/backup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/backup.c b/block/backup.c
index 4a1af68..ddf8424 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -431,7 +431,7 @@ static void coroutine_fn backup_run(void *opaque)
if (job->sync_bitmap) {
BdrvDirtyBitmap *bm;
- if (ret < 0) {
+ 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);
--
2.4.3
- [Qemu-devel] [PATCH 00/10] block: incremental backup transactions using BlockJobTxn, Stefan Hajnoczi, 2015/06/25
- [Qemu-devel] [PATCH 02/10] iotests: add transactional incremental backup test, Stefan Hajnoczi, 2015/06/25
- [Qemu-devel] [PATCH 01/10] qapi: Add transaction support to block-dirty-bitmap operations, Stefan Hajnoczi, 2015/06/25
- [Qemu-devel] [PATCH 04/10] block: keep bitmap if incremental backup job is cancelled,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 03/10] block: rename BlkTransactionState and BdrvActionOps, Stefan Hajnoczi, 2015/06/25
- [Qemu-devel] [PATCH 06/10] blockdev: make BlockJobTxn available to qmp 'transaction', Stefan Hajnoczi, 2015/06/25
- [Qemu-devel] [PATCH 07/10] block/backup: support block job transactions, Stefan Hajnoczi, 2015/06/25