Message ID | 1412182919-9550-3-git-send-email-stefanha@redhat.com |
---|---|
State | New |
Headers | show |
On 01.10.2014 19:01, Stefan Hajnoczi wrote: > Make sure that query-block-jobs acquires the BlockDriverState > AioContext so that the blockjob isn't running in another thread while we > access its state. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > blockdev.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) This conflicts with patch 7 Markus's BlockBackend series; but in itself, this patch is fine. Reviewed-by: Max Reitz <mreitz@redhat.com>
diff --git a/blockdev.c b/blockdev.c index 379a268..270425d 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2585,14 +2585,19 @@ fail: static void do_qmp_query_block_jobs_one(void *opaque, BlockDriverState *bs) { BlockJobInfoList **prev = opaque; - BlockJob *job = bs->job; + AioContext *aio_context; + + aio_context = bdrv_get_aio_context(bs); + aio_context_acquire(aio_context); - if (job) { + if (bs->job) { BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1); elem->value = block_job_query(bs->job); (*prev)->next = elem; *prev = elem; } + + aio_context_release(aio_context); } BlockJobInfoList *qmp_query_block_jobs(Error **errp)
Make sure that query-block-jobs acquires the BlockDriverState AioContext so that the blockjob isn't running in another thread while we access its state. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- blockdev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)