From nobody Wed Dec 17 05:35:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563544010; cv=none; d=zoho.com; s=zohoarc; b=IGLFo1mEG8/vutsZjg/a750wdUwWdqM+JQjBYZoU3SfIUx4YaYfq/D4Jia+2+YPPwNsXH4PAq5bzSmC3EZBfmTMiqNGJCi0D8vKZZkI9B/cI5+FFcouFeSfBi2NnGHWaXfct1ocLu2Fl5tbMXLnJCmVMWabHplrvwNX9byC1s5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563544010; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=DEYtSFJjyz1wmpmti79HWlDGD++xqdpZPRkFDFj7JHU=; b=OsfDhNj6rnTItmbw5i4soav1jDopk98PPu4eXe+SeU5hrh+fH3QDkltF62T5o7NrnRqg8XGQoBM8EcIusulfEe7YeM2i8PBPxgbPmxGG1HDyEnKAgPhUpijkwWST3uywHlOI7Fkr67yrZr3OHTpLzF92sVS4IJzrdMlnTXHgIII= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563544010691156.31642217069407; Fri, 19 Jul 2019 06:46:50 -0700 (PDT) Received: from localhost ([::1]:45684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoTDl-0005Jn-Ce for importer@patchew.org; Fri, 19 Jul 2019 09:46:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40482) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoTBH-00044o-Qk for qemu-devel@nongnu.org; Fri, 19 Jul 2019 09:44:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoTBG-0003cD-Iz for qemu-devel@nongnu.org; Fri, 19 Jul 2019 09:44:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hoTBB-0003Y0-GW; Fri, 19 Jul 2019 09:44:11 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 16A0237F46; Fri, 19 Jul 2019 13:44:08 +0000 (UTC) Received: from dhcp-200-226.str.redhat.com (dhcp-200-226.str.redhat.com [10.33.200.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD561608A4; Fri, 19 Jul 2019 13:44:05 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 19 Jul 2019 15:43:41 +0200 Message-Id: <20190719134345.23526-10-kwolf@redhat.com> In-Reply-To: <20190719134345.23526-1-kwolf@redhat.com> References: <20190719134345.23526-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 19 Jul 2019 13:44:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PULL 09/13] block: Loop unsafely in bdrv*drained_end() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Max Reitz The graph must not change in these loops (or a QLIST_FOREACH_SAFE would not even be enough). We now ensure this by only polling once in the root bdrv_drained_end() call, so we can drop the _SAFE suffix. Doing so makes it clear that the graph must not change. Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- block/io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/io.c b/block/io.c index 8f23cab82e..b89e155d21 100644 --- a/block/io.c +++ b/block/io.c @@ -76,9 +76,9 @@ static void bdrv_parent_drained_end(BlockDriverState *bs,= BdrvChild *ignore, bool ignore_bds_parents, int *drained_end_counter) { - BdrvChild *c, *next; + BdrvChild *c; =20 - QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) { + QLIST_FOREACH(c, &bs->parents, next_parent) { if (c =3D=3D ignore || (ignore_bds_parents && c->role->parent_is_b= ds)) { continue; } @@ -456,7 +456,7 @@ static void bdrv_do_drained_end(BlockDriverState *bs, b= ool recursive, BdrvChild *parent, bool ignore_bds_parents, int *drained_end_counter) { - BdrvChild *child, *next; + BdrvChild *child; int old_quiesce_counter; =20 assert(drained_end_counter !=3D NULL); @@ -481,7 +481,7 @@ static void bdrv_do_drained_end(BlockDriverState *bs, b= ool recursive, if (recursive) { assert(!ignore_bds_parents); bs->recursive_quiesce_counter--; - QLIST_FOREACH_SAFE(child, &bs->children, next, next) { + QLIST_FOREACH(child, &bs->children, next) { bdrv_do_drained_end(child->bs, true, child, ignore_bds_parents, drained_end_counter); } --=20 2.20.1