From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu1j7-0005a8-EF for qemu-devel@nongnu.org; Wed, 04 Nov 2015 12:20:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zu1j4-0003b8-80 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 12:20:01 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:45285 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu1j3-0003av-SX for qemu-devel@nongnu.org; Wed, 04 Nov 2015 12:19:58 -0500 From: "Denis V. Lunev" Date: Wed, 4 Nov 2015 20:19:40 +0300 Message-Id: <1446657582-21619-10-git-send-email-den@openvz.org> In-Reply-To: <1446657582-21619-1-git-send-email-den@openvz.org> References: <1446657582-21619-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 09/11] migration: add missed aio_context_acquire for state writing/reading List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , qemu-devel@nongnu.org, Stefan Hajnoczi aio_context should be locked in the similar way as was done in QMP snapshot creation in the other case there are a lot of possible troubles if native AIO mode is enabled for disk. qemu_fopen_bdrv and bdrv_fclose are used in real snapshot operations only along with block drivers. This change should influence only HMP snapshot operations. AioContext lock is reqursive. Thus nested locking should not be a problem. Signed-off-by: Denis V. Lunev Reviewed-by: Paolo Bonzini Reviewed-by: Juan Quintela CC: Stefan Hajnoczi CC: Kevin Wolf --- migration/savevm.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 9339f2e..f8c727d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -153,7 +153,11 @@ static ssize_t block_get_buffer(void *opaque, uint8_t *buf, int64_t pos, static int bdrv_fclose(void *opaque) { - return bdrv_flush(opaque); + BlockDriverState *bs = (BlockDriverState *)opaque; + int ret = bdrv_flush(bs); + + aio_context_release(bdrv_get_aio_context(bs)); + return ret; } static const QEMUFileOps bdrv_read_ops = { @@ -169,10 +173,18 @@ static const QEMUFileOps bdrv_write_ops = { static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int is_writable) { + QEMUFile *file; + if (is_writable) { - return qemu_fopen_ops(bs, &bdrv_write_ops); + file = qemu_fopen_ops(bs, &bdrv_write_ops); + } else { + file = qemu_fopen_ops(bs, &bdrv_read_ops); + } + + if (file != NULL) { + aio_context_acquire(bdrv_get_aio_context(bs)); } - return qemu_fopen_ops(bs, &bdrv_read_ops); + return file; } -- 2.5.0