diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-23 11:48:23 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-02-02 17:50:47 +0100 |
| commit | 1963f8d52e04a8f8b213e34e6a76fb286fb23ec1 (patch) | |
| tree | 91c25e206ec38d404e1bf62a868f105adcb300a3 | |
| parent | c78dc18295cb79c36d8993f245537f997cd9f2bb (diff) | |
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 <pbonzini@redhat.com>
Message-id: 1450867706-19860-1-git-send-email-pbonzini@redhat.com
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block/qapi.c | 9 |
1 files changed, 7 insertions, 2 deletions
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. */ |