From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Ciw-0007So-E8 for qemu-devel@nongnu.org; Wed, 18 May 2016 21:26:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Cis-0004kA-67 for qemu-devel@nongnu.org; Wed, 18 May 2016 21:26:01 -0400 From: Fam Zheng Date: Thu, 19 May 2016 09:25:46 +0800 Message-Id: <1463621147-12285-2-git-send-email-famz@redhat.com> In-Reply-To: <1463621147-12285-1-git-send-email-famz@redhat.com> References: <1463621147-12285-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/2] backup: Fail early if cannot determine cluster size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jeff Cody , Kevin Wolf , Max Reitz , qemu-block@nongnu.org, jsnow@redhat.com, qemu-stable@nongnu.org, eblake@redhat.com Otherwise the job is orphaned and block_job_cancel_sync in bdrv_close_all() when quitting will trigger assertion failure. Cc: qemu-stable@nongnu.org Reviewed-by: John Snow Reviewed-by: Jeff Cody Signed-off-by: Fam Zheng --- block/backup.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/block/backup.c b/block/backup.c index 491fd14..3ff48c6 100644 --- a/block/backup.c +++ b/block/backup.c @@ -505,6 +505,7 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, int64_t len; BlockDriverInfo bdi; int ret; + int64_t cluster_size; assert(bs); assert(target); @@ -568,23 +569,10 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, goto error; } - BackupBlockJob *job = block_job_create(&backup_job_driver, bs, speed, - cb, opaque, errp); - if (!job) { - goto error; - } - - job->on_source_error = on_source_error; - job->on_target_error = on_target_error; - job->target = target; - job->sync_mode = sync_mode; - job->sync_bitmap = sync_mode == MIRROR_SYNC_MODE_INCREMENTAL ? - sync_bitmap : NULL; - /* If there is no backing file on the target, we cannot rely on COW if our * backup cluster size is smaller than the target cluster size. Even for * targets with a backing file, try to avoid COW if possible. */ - ret = bdrv_get_info(job->target, &bdi); + ret = bdrv_get_info(target, &bdi); if (ret < 0 && !target->backing) { error_setg_errno(errp, -ret, "Couldn't determine the cluster size of the target image, " @@ -594,11 +582,25 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, goto error; } else if (ret < 0 && target->backing) { /* Not fatal; just trudge on ahead. */ - job->cluster_size = BACKUP_CLUSTER_SIZE_DEFAULT; + cluster_size = BACKUP_CLUSTER_SIZE_DEFAULT; } else { - job->cluster_size = MAX(BACKUP_CLUSTER_SIZE_DEFAULT, bdi.cluster_size); + cluster_size = MAX(BACKUP_CLUSTER_SIZE_DEFAULT, bdi.cluster_size); } + BackupBlockJob *job = block_job_create(&backup_job_driver, bs, speed, + cb, opaque, errp); + if (!job) { + goto error; + } + + job->on_source_error = on_source_error; + job->on_target_error = on_target_error; + job->target = target; + job->sync_mode = sync_mode; + job->sync_bitmap = sync_mode == MIRROR_SYNC_MODE_INCREMENTAL ? + sync_bitmap : NULL; + job->cluster_size = cluster_size; + bdrv_op_block_all(target, job->common.blocker); job->common.len = len; job->common.co = qemu_coroutine_create(backup_run); -- 2.8.2