From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcKA-00009d-8A for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:12:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtcK6-0007Ye-2F for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:12:34 -0500 From: "Denis V. Lunev" Date: Tue, 3 Nov 2015 17:12:07 +0300 Message-Id: <1446559933-28965-5-git-send-email-den@openvz.org> In-Reply-To: <1446559933-28965-1-git-send-email-den@openvz.org> References: <1446559933-28965-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 04/10] blockdev: acquire AioContext in hmp_commit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Denis V. Lunev" , qemu-devel@nongnu.org, Stefan Hajnoczi , qemu-stable@nongnu.org From: Stefan Hajnoczi This one slipped through. Although we acquire AioContext when committing all devices we don't for just a single device. AioContext must be acquired before calling bdrv_*() functions to synchronize access with other threads that may be using the AioContext. Signed-off-by: Stefan Hajnoczi Signed-off-by: Denis V. Lunev --- blockdev.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 18712d2..d611779 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1120,6 +1120,9 @@ void hmp_commit(Monitor *mon, const QDict *qdict) if (!strcmp(device, "all")) { ret = bdrv_commit_all(); } else { + BlockDriverState *bs; + AioContext *aio_context; + blk = blk_by_name(device); if (!blk) { monitor_printf(mon, "Device '%s' not found\n", device); @@ -1129,7 +1132,14 @@ void hmp_commit(Monitor *mon, const QDict *qdict) monitor_printf(mon, "Device '%s' has no medium\n", device); return; } - ret = bdrv_commit(blk_bs(blk)); + + bs = blk_bs(blk); + aio_context = bdrv_get_aio_context(bs); + aio_context_acquire(aio_context); + + ret = bdrv_commit(bs); + + aio_context_release(aio_context); } if (ret < 0) { monitor_printf(mon, "'commit' error for '%s': %s\n", device, -- 2.5.0