From patchwork Tue Nov 3 14:12:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 539415 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BC8261402D7 for ; Wed, 4 Nov 2015 01:13:26 +1100 (AEDT) Received: from localhost ([::1]:48751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcKy-0001Ta-BW for incoming@patchwork.ozlabs.org; Tue, 03 Nov 2015 09:13:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcK5-0008Pf-0q for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:12:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtcK3-0007XN-Ux for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:12:28 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:17100 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcJy-0007UI-1M; Tue, 03 Nov 2015 09:12:22 -0500 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id tA3ECDlP017329; Tue, 3 Nov 2015 17:12:19 +0300 (MSK) From: "Denis V. Lunev" To: Date: Tue, 3 Nov 2015 17:12:06 +0300 Message-Id: <1446559933-28965-4-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1446559933-28965-1-git-send-email-den@openvz.org> References: <1446559933-28965-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Juan Quintela , qemu-devel@nongnu.org, qemu-stable@nongnu.org, Stefan Hajnoczi , Amit Shah , "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 03/10] migration: added missed aio_context_acquire around bdrv_snapshot_delete X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Necessary for bdrv_drain to run properly. Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi CC: Juan Quintela CC: Amit Shah --- migration/savevm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/migration/savevm.c b/migration/savevm.c index 1653f56..f45ff63 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1273,7 +1273,12 @@ static int del_existing_snapshots(Monitor *mon, const char *name) while ((bs = bdrv_next(bs))) { if (bdrv_can_snapshot(bs) && bdrv_snapshot_find(bs, snapshot, name) >= 0) { + AioContext *ctx = bdrv_get_aio_context(bs); + + aio_context_acquire(ctx); bdrv_snapshot_delete_by_id_or_name(bs, name, &err); + aio_context_release(ctx); + if (err) { monitor_printf(mon, "Error while deleting snapshot on device '%s':" @@ -1518,8 +1523,13 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) bs = NULL; while ((bs = bdrv_next(bs))) { if (bdrv_can_snapshot(bs)) { + AioContext *ctx = bdrv_get_aio_context(bs); + err = NULL; + aio_context_acquire(ctx); bdrv_snapshot_delete_by_id_or_name(bs, name, &err); + aio_context_release(ctx); + if (err) { monitor_printf(mon, "Error while deleting snapshot on device '%s':"