From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNgQ2-0005VS-6a for qemu-devel@nongnu.org; Wed, 12 Mar 2014 06:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNgPw-0003Od-8i for qemu-devel@nongnu.org; Wed, 12 Mar 2014 06:29:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNgPw-0003OX-1Y for qemu-devel@nongnu.org; Wed, 12 Mar 2014 06:29:44 -0400 From: Stefan Hajnoczi Date: Wed, 12 Mar 2014 11:29:12 +0100 Message-Id: <1394620172-25071-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1394620172-25071-1-git-send-email-stefanha@redhat.com> References: <1394620172-25071-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 04/24] block: bs->drv may be NULL in bdrv_debug_resume() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori From: Max Reitz Currently, bdrv_debug_resume() requires every bs->drv in the BDS stack to be NULL until a bs->drv with an implementation of bdrv_debug_resume() is found. For a normal function, this would be fine, but this is a function for debugging purposes and should therefore allow intermediate BDS not to have a driver (i.e., be "ejected"). Otherwise, it is hard to debug such situations. Signed-off-by: Max Reitz Signed-off-by: Stefan Hajnoczi --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 7b306fb..09c9258 100644 --- a/block.c +++ b/block.c @@ -4055,7 +4055,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) { + while (bs && (!bs->drv || !bs->drv->bdrv_debug_resume)) { bs = bs->file; } -- 1.8.5.3