From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDPHT-0007De-7K for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDPHS-0006xG-9f for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDPHS-0006x0-3R for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:18 -0400 From: Fam Zheng Date: Fri, 10 Jul 2015 11:46:41 +0800 Message-Id: <1436500012-32593-5-git-send-email-famz@redhat.com> In-Reply-To: <1436500012-32593-1-git-send-email-famz@redhat.com> References: <1436500012-32593-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v3 04/15] block: keep bitmap if incremental backup job is cancelled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , famz@redhat.com, John Snow , Jeff Cody , Max Reitz , vsementsov@parallels.com, stefanha@redhat.com From: Stefan Hajnoczi 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 Reviewed-by: Fam Zheng Signed-off-by: Fam Zheng --- block/backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/backup.c b/block/backup.c index d3c7d9f..965654d 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