From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZulBw-0008C0-Tr for qemu-devel@nongnu.org; Fri, 06 Nov 2015 12:52:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZulBt-0001G8-Pn for qemu-devel@nongnu.org; Fri, 06 Nov 2015 12:52:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZulBt-0001Fo-Fk for qemu-devel@nongnu.org; Fri, 06 Nov 2015 12:52:45 -0500 From: Stefan Hajnoczi Date: Fri, 6 Nov 2015 17:52:28 +0000 Message-Id: <1446832349-14952-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1446832349-14952-1-git-send-email-stefanha@redhat.com> References: <1446832349-14952-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 6/7] monitor: add missed aio_context_acquire into vm_completion call List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Markus Armbruster , Luiz Capitulino , Stefan Hajnoczi , "Denis V. Lunev" From: "Denis V. Lunev" Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi CC: Kevin Wolf CC: Luiz Capitulino CC: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- monitor.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 6cd747f..3295840 100644 --- a/monitor.c +++ b/monitor.c @@ -3408,13 +3408,18 @@ static void vm_completion(ReadLineState *rs, const char *str) readline_set_completion_index(rs, len); while ((bs = bdrv_next(bs))) { SnapshotInfoList *snapshots, *snapshot; + AioContext *ctx = bdrv_get_aio_context(bs); + bool ok = false; - if (!bdrv_can_snapshot(bs)) { - continue; + aio_context_acquire(ctx); + if (bdrv_can_snapshot(bs)) { + ok = bdrv_query_snapshot_info_list(bs, &snapshots, NULL) == 0; } - if (bdrv_query_snapshot_info_list(bs, &snapshots, NULL)) { + aio_context_release(ctx); + if (!ok) { continue; } + snapshot = snapshots; while (snapshot) { char *completion = snapshot->value->name; -- 2.5.0