From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDPHb-0007UY-OA for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDPHX-000700-JD for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44962) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDPHX-0006ze-Er for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:23 -0400 From: Fam Zheng Date: Fri, 10 Jul 2015 11:46:42 +0800 Message-Id: <1436500012-32593-6-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 05/15] backup: Extract dirty bitmap handling as a separate function 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 This will be reused by the coming new transactional completion code. Signed-off-by: Fam Zheng --- block/backup.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/block/backup.c b/block/backup.c index 965654d..6e24384 100644 --- a/block/backup.c +++ b/block/backup.c @@ -210,6 +210,21 @@ static void backup_iostatus_reset(BlockJob *job) bdrv_iostatus_reset(s->target); } +static void backup_handle_dirty_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), @@ -430,16 +445,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_handle_dirty_bitmap(job, ret); } hbitmap_free(job->bitmap); -- 2.4.3