Re: [PATCH] migration/block-dirty-bitmap: fix add_bitmaps_to_list

[Eric Blake]

On 6/26/20 8:06 AM, Vladimir Sementsov-Ogievskiy wrote:
> We shouldn't fail, if found unnamed bitmap in a unnamed node or node

We shouldn't fail when finding an unnamed

> with auto-generated node name, as bitmap migration ignores such bitmaps
> at all.

such bitmaps in the first place.

> Fixes: 82640edb88faa
> Fixes: 4ff5cc121b089
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>   migration/block-dirty-bitmap.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

Will queue through the bitmaps tree.

Is this easy enough to reproduce that it would be worth having iotest 
coverage?

> 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;
>       }

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org