From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 4 Feb 2014 10:45:31 +0000 (+0100)
Subject: block: Fix bdrv_is_first_non_filter()
X-Git-Tag: v2.0.0-rc0~69^2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6dc8a1f83835054fcaf1dcb41af7c868688c068;p=thirdparty%2Fqemu.git

block: Fix bdrv_is_first_non_filter()

Consider top level BlockDriverStates as well.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Tested-by: Benoit Canet <benoit@irqsave.net>
---

diff --git a/block.c b/block.c
index 6f4bacaa588..034e1ab04d2 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) {