diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-08-18 14:52:28 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2014-08-20 11:53:42 +0200 |
commit | 927e0e769f4008f458de8a94a809e85c1fd016eb (patch) | |
tree | a3ffc9b70aca58ac6afcc289c9e2cb2e565ecf27 /blockdev.c | |
parent | 6ffb4cb6fd2046e2efb658fb0136e22e4cd0c670 (diff) | |
download | qemu-927e0e769f4008f458de8a94a809e85c1fd016eb.zip qemu-927e0e769f4008f458de8a94a809e85c1fd016eb.tar.gz qemu-927e0e769f4008f458de8a94a809e85c1fd016eb.tar.bz2 |
block: acquire AioContext in qmp_block_resize()
Make block_resize safe for dataplane where another thread may be running
the BlockDriverState's AioContext.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'blockdev.c')
-rw-r--r-- | blockdev.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -1799,6 +1799,7 @@ void qmp_block_resize(bool has_device, const char *device, { Error *local_err = NULL; BlockDriverState *bs; + AioContext *aio_context; int ret; bs = bdrv_lookup_bs(has_device ? device : NULL, @@ -1809,19 +1810,22 @@ void qmp_block_resize(bool has_device, const char *device, return; } + aio_context = bdrv_get_aio_context(bs); + aio_context_acquire(aio_context); + if (!bdrv_is_first_non_filter(bs)) { error_set(errp, QERR_FEATURE_DISABLED, "resize"); - return; + goto out; } if (size < 0) { error_set(errp, QERR_INVALID_PARAMETER_VALUE, "size", "a >0 size"); - return; + goto out; } if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, NULL)) { error_set(errp, QERR_DEVICE_IN_USE, device); - return; + goto out; } /* complete all in-flight operations before resizing the device */ @@ -1847,6 +1851,9 @@ void qmp_block_resize(bool has_device, const char *device, error_setg_errno(errp, -ret, "Could not resize"); break; } + +out: + aio_context_release(aio_context); } static void block_job_cb(void *opaque, int ret) |