On 02/13/2014 07:23 AM, Jeff Cody wrote:
> 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 <arm...@redhat.com>
> Signed-off-by: Jeff Cody <jc...@redhat.com>
> ---
> block/mirror.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/block/mirror.c b/block/mirror.c
> index 2a43334..ddb5765 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -633,6 +633,8 @@ void commit_active_start(BlockDriverState *bs,
> BlockDriverState *base,
> {
> int64_t length, base_length;
> int orig_base_flags;
> + Error *local_err = NULL;
> +
>
> orig_base_flags = bdrv_get_flags(base);Why the double blank line? Besides that, Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
