From patchwork Fri Apr 15 03:11:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8844511 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D895CC0553 for ; Fri, 15 Apr 2016 03:11:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F1C420373 for ; Fri, 15 Apr 2016 03:11:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D146202F0 for ; Fri, 15 Apr 2016 03:11:18 +0000 (UTC) Received: from localhost ([::1]:52514 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aquA9-0008WV-Mf for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Apr 2016 23:11:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aquA1-0008Sr-Od for qemu-devel@nongnu.org; Thu, 14 Apr 2016 23:11:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aquA0-0006oM-VI for qemu-devel@nongnu.org; Thu, 14 Apr 2016 23:11:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqu9w-0006mx-Rl; Thu, 14 Apr 2016 23:11:04 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB6A464075; Fri, 15 Apr 2016 03:11:03 +0000 (UTC) Received: from lemon.nay.redhat.com (dhcp-14-170.nay.redhat.com [10.66.14.170]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3F3B1BY026507; Thu, 14 Apr 2016 23:11:02 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 15 Apr 2016 11:11:06 +0800 Message-Id: <1460689866-31020-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 15 Apr 2016 03:11:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] block: Inactivate all nodes at migration source X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP qcow2 is not necessarily the top layer node. Since bdrv_inactivate() doesn't recurse, we should ensure all block nodes are inactivated. Signed-off-by: Fam Zheng --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index d4939b4..1c575e4 100644 --- a/block.c +++ b/block.c @@ -3270,7 +3270,7 @@ int bdrv_inactivate_all(void) BlockDriverState *bs = NULL; int ret; - while ((bs = bdrv_next(bs)) != NULL) { + while ((bs = bdrv_next_node(bs)) != NULL) { AioContext *aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context);