Re: [Qemu-devel] [PATCH] block: acquire in bdrv_query_image_info

[Fam Zheng <famz@redhat.com>]

On Wed, 12/23 11:48, Paolo Bonzini wrote:
> NFS calls aio_poll inside bdrv_get_allocated_size.  This requires
> acquiring the AioContext.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  block/qapi.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/block/qapi.c b/block/qapi.c
> index fecac25..ea400e0 100644
> --- a/block/qapi.c
> +++ b/block/qapi.c
> @@ -210,11 +210,13 @@ void bdrv_query_image_info(BlockDriverState *bs,
>      Error *err = NULL;
>      ImageInfo *info;
>  
> +    aio_context_acquire(bdrv_get_aio_context(bs));
> +
>      size = bdrv_getlength(bs);
>      if (size < 0) {
>          error_setg_errno(errp, -size, "Can't get size of device '%s'",
>                           bdrv_get_device_name(bs));
> -        return;
> +        goto out;
>      }
>  
>      info = g_new0(ImageInfo, 1);
> @@ -281,10 +283,13 @@ void bdrv_query_image_info(BlockDriverState *bs,
>      default:
>          error_propagate(errp, err);
>          qapi_free_ImageInfo(info);
> -        return;
> +        goto out;
>      }
>  
>      *p_info = info;
> +
> +out:
> +    aio_context_release(bdrv_get_aio_context(bs));
>  }
>  
>  /* @p_info will be set only on success. */
> -- 
> 2.5.0
> 
> 

Reviewed-by: Fam Zheng <famz@redhat.com>