From: Jeff Cody Date: Thu, 13 Feb 2014 14:23:38 +0000 (-0500) Subject: block: mirror - use local_err to avoid NULL errp X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1066^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc67f4d1f9645e8e6d90aee84ca19162d661f082;p=sdk%2Femulator%2Fqemu.git block: mirror - use local_err to avoid NULL errp 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 --- 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; }