From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyLD-0001Tw-S9 for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGyL8-0000O3-Q6 for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyL8-0000Ns-If for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:02 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1LMD1TX032180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Feb 2014 17:13:01 -0500 From: Kevin Wolf Date: Fri, 21 Feb 2014 23:11:59 +0100 Message-Id: <1393020771-32712-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1393020771-32712-1-git-send-email-kwolf@redhat.com> References: <1393020771-32712-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 02/54] block: Fix bdrv_is_first_non_filter() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Consider top level BlockDriverStates as well. Signed-off-by: Kevin Wolf Reviewed-by: Benoit Canet Tested-by: Benoit Canet --- block.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/block.c b/block.c index 6f4baca..034e1ab 100644 --- a/block.c +++ b/block.c @@ -5416,11 +5416,7 @@ bool bdrv_is_first_non_filter(BlockDriverState *candidate) QTAILQ_FOREACH(bs, &bdrv_states, device_list) { bool perm; - if (!bs->file) { - continue; - } - - perm = bdrv_recurse_is_first_non_filter(bs->file, candidate); + perm = bdrv_recurse_is_first_non_filter(bs, candidate); /* candidate is the first non filter */ if (perm) { -- 1.8.1.4