From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGBt-0006Vj-8o for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:53:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlGBn-0000sQ-2X for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41696) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGBm-0000sJ-Lc for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:50 -0500 From: Stefan Hajnoczi Date: Mon, 3 Nov 2014 11:50:47 +0000 Message-Id: <1415015456-25086-45-git-send-email-stefanha@redhat.com> In-Reply-To: <1415015456-25086-1-git-send-email-stefanha@redhat.com> References: <1415015456-25086-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 44/53] blockdev: acquire AioContext in do_qmp_query_block_jobs_one() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi 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 Reviewed-by: Max Reitz Message-id: 1413889440-32577-3-git-send-email-stefanha@redhat.com --- blockdev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blockdev.c b/blockdev.c index 501473d..40fc5d6 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2628,12 +2628,18 @@ BlockJobInfoList *qmp_query_block_jobs(Error **errp) BlockDriverState *bs; for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) { + AioContext *aio_context = bdrv_get_aio_context(bs); + + aio_context_acquire(aio_context); + if (bs->job) { BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1); elem->value = block_job_query(bs->job); *p_next = elem; p_next = &elem->next; } + + aio_context_release(aio_context); } return head; -- 1.9.3