From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZNIA-0002XA-VA for qemu-devel@nongnu.org; Wed, 01 Oct 2014 13:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZNI3-0001aK-19 for qemu-devel@nongnu.org; Wed, 01 Oct 2014 13:02:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56066) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZNI2-0001Zn-R1 for qemu-devel@nongnu.org; Wed, 01 Oct 2014 13:02:10 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s91H2ASZ011232 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 1 Oct 2014 13:02:10 -0400 From: Stefan Hajnoczi Date: Wed, 1 Oct 2014 18:01:50 +0100 Message-Id: <1412182919-9550-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1412182919-9550-1-git-send-email-stefanha@redhat.com> References: <1412182919-9550-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 02/11] 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: Kevin Wolf , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , Max Reitz 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 --- blockdev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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) -- 1.9.3