From nobody Tue Nov 11 20:52: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=1565367610; cv=none; d=zoho.com; s=zohoarc; b=OaToeveHZYjkF/KS+s8sW6j0LDFv/KfH5kSOIIa3rj6O0RHpjbKhV1eMSI81f5a2F/BgFqCFRTOuEq5iQBsY83mejtZxMTGPphF4t4HNQjdZXCEasm0CoQnQegrM6jke+eD1Ot+kO2zz1C/pgeMnWMGnK2v5/6ugJMsNilKWTrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565367610; 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=WtTjHQ5IvPc6zVp0Ar7pf8c6nh2HLkhYmMgguWurTHg=; b=V1YyPTVuZuQcSmfUSZx07Vnq0SZgfw/uQnt0+V8S8xBvh63Ofz2JeL04ry2ZJSxw5dPoq+IYInzMDoGu5EnrkG7HnAVU6ARQRpS6GKVLpkd7ArcCApdDpMv0z+qQCikp/dbv80PDmnk8gkxTRP8DHD5hvb75xesreJwSc4tONqY= 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 1565367610229909.8206347518118; Fri, 9 Aug 2019 09:20:10 -0700 (PDT) Received: from localhost ([::1]:60893 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw7cf-0004yn-6K for importer@patchew.org; Fri, 09 Aug 2019 12:20:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57290) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw7Xh-0002Gx-D8 for qemu-devel@nongnu.org; Fri, 09 Aug 2019 12:15:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hw7Xg-0004IK-Bv for qemu-devel@nongnu.org; Fri, 09 Aug 2019 12:15:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58998) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hw7Xe-0004Gq-8N; Fri, 09 Aug 2019 12:14:58 -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 91657309E5B4; Fri, 9 Aug 2019 16:14:57 +0000 (UTC) Received: from localhost (unknown [10.40.205.179]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D7CC608C2; Fri, 9 Aug 2019 16:14:57 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 9 Aug 2019 18:13:46 +0200 Message-Id: <20190809161407.11920-22-mreitz@redhat.com> In-Reply-To: <20190809161407.11920-1-mreitz@redhat.com> References: <20190809161407.11920-1-mreitz@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.43]); Fri, 09 Aug 2019 16:14:57 +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] [PATCH v6 21/42] block: Use CAFs for debug breakpoints 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When looking for a blkdebug node (which implements debug breakpoints), use bdrv_primary_bs() to iterate through the graph, because that is where a blkdebug node would be. Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index a467b175c6..1070aa1ba9 100644 --- a/block.c +++ b/block.c @@ -5218,7 +5218,7 @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const= char *event, const char *tag) { while (bs && bs->drv && !bs->drv->bdrv_debug_breakpoint) { - bs =3D bs->file ? bs->file->bs : NULL; + bs =3D bdrv_primary_bs(bs); } =20 if (bs && bs->drv && bs->drv->bdrv_debug_breakpoint) { @@ -5231,7 +5231,7 @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const= char *event, int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag) { while (bs && bs->drv && !bs->drv->bdrv_debug_remove_breakpoint) { - bs =3D bs->file ? bs->file->bs : NULL; + bs =3D bdrv_primary_bs(bs); } =20 if (bs && bs->drv && bs->drv->bdrv_debug_remove_breakpoint) { @@ -5244,7 +5244,7 @@ int bdrv_debug_remove_breakpoint(BlockDriverState *bs= , const char *tag) int bdrv_debug_resume(BlockDriverState *bs, const char *tag) { while (bs && (!bs->drv || !bs->drv->bdrv_debug_resume)) { - bs =3D bs->file ? bs->file->bs : NULL; + bs =3D bdrv_primary_bs(bs); } =20 if (bs && bs->drv && bs->drv->bdrv_debug_resume) { @@ -5257,7 +5257,7 @@ int bdrv_debug_resume(BlockDriverState *bs, const cha= r *tag) bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag) { while (bs && bs->drv && !bs->drv->bdrv_debug_is_suspended) { - bs =3D bs->file ? bs->file->bs : NULL; + bs =3D bdrv_primary_bs(bs); } =20 if (bs && bs->drv && bs->drv->bdrv_debug_is_suspended) { --=20 2.21.0