[qemu-xen staging] migration/block-dirty-bitmap: fix add_bitmaps_to_list

[patchbot@xxxxxxx]

commit 7cb015197b383a62f5729d2c92b1050db0185c1c
Author:     Vladimir Sementsov-Ogievskiy <vsementsov@xxxxxxxxxxxxx>
AuthorDate: Fri Jun 26 16:06:58 2020 +0300
Commit:     Eric Blake <eblake@xxxxxxxxxx>
CommitDate: Fri Jul 17 08:18:51 2020 -0500

    migration/block-dirty-bitmap: fix add_bitmaps_to_list
    
    We shouldn't fail when finding an unnamed bitmap in a unnamed node or
    node with auto-generated node name, as bitmap migration ignores such
    bitmaps in the first place.
    
    Fixes: 82640edb88faa
    Fixes: 4ff5cc121b089
    Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@xxxxxxxxxxxxx>
    Message-Id: <20200626130658.76498-1-vsementsov@xxxxxxxxxxxxx>
    Reviewed-by: Eric Blake <eblake@xxxxxxxxxx>
    [eblake: commit message grammar tweaks]
    Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
---
 migration/block-dirty-bitmap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 47bc0f650c..b0dbf9eeed 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -274,7 +274,11 @@ static int add_bitmaps_to_list(BlockDriverState *bs, const 
char *bs_name)
     DirtyBitmapMigBitmapState *dbms;
     Error *local_err = NULL;
 
-    bitmap = bdrv_dirty_bitmap_first(bs);
+    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {
+        if (bdrv_dirty_bitmap_name(bitmap)) {
+            break;
+        }
+    }
     if (!bitmap) {
         return 0;
     }
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging