[Qemu-devel] [PULL 02/54] block: Fix bdrv_is_first_non_filter()

[Kevin Wolf]

Consider top level BlockDriverStates as well.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Tested-by: Benoit Canet <address@hidden>
---
 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