From: Paolo Bonzini Date: Wed, 23 Dec 2015 10:48:23 +0000 (+0100) Subject: block: acquire in bdrv_query_image_info X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1963f8d52e04a8f8b213e34e6a76fb286fb23ec1;p=qemu.git block: acquire in bdrv_query_image_info NFS calls aio_poll inside bdrv_get_allocated_size. This requires acquiring the AioContext. Signed-off-by: Paolo Bonzini Message-id: 1450867706-19860-1-git-send-email-pbonzini@redhat.com Reviewed-by: Fam Zheng Signed-off-by: Max Reitz --- diff --git a/block/qapi.c b/block/qapi.c index bbe0c9dddb..2e8310591d 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -211,11 +211,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); @@ -283,10 +285,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. */