Commit 7cb01519 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

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: 82640edb
Fixes: 4ff5cc12
Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200626130658.76498-1-vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
[eblake: commit message grammar tweaks]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 151f76c6

migration/block-dirty-bitmap.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

    }