From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEMaU-0000Ib-28 for qemu-devel@nongnu.org; Fri, 14 Feb 2014 12:30:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEMaM-0004cq-RL for qemu-devel@nongnu.org; Fri, 14 Feb 2014 12:30:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24186) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEMaM-0004cb-JN for qemu-devel@nongnu.org; Fri, 14 Feb 2014 12:29:58 -0500 From: Stefan Hajnoczi Date: Fri, 14 Feb 2014 18:29:30 +0100 Message-Id: <1392398973-15092-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1392398973-15092-1-git-send-email-stefanha@redhat.com> References: <1392398973-15092-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 08/11] block: mirror - use local_err to avoid NULL errp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori From: Jeff Cody When starting a block job, commit_active_start() relies on whether *errp is set by mirror_start_job. This allows it to determine if the mirror job start failed, so that it can clean up any changes to open flags from the bdrv_reopen(). If errp is NULL, then it will not be able to determine if mirror_start_job failed or not. To avoid this, use a local Error variable, and then propagate the error (if any) to errp. Reported-by: Markus Armbruster Signed-off-by: Jeff Cody Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- block/mirror.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 26d18e4..e683959 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -634,6 +634,7 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, int64_t length, base_length; int orig_base_flags; int ret; + Error *local_err = NULL; orig_base_flags = bdrv_get_flags(base); @@ -668,9 +669,10 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, bdrv_ref(base); mirror_start_job(bs, base, speed, 0, 0, - on_error, on_error, cb, opaque, errp, + on_error, on_error, cb, opaque, &local_err, &commit_active_job_driver, false, base); - if (error_is_set(errp)) { + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); goto error_restore_flags; } -- 1.8.5.3