Commit 82640edb authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

migration: add_bitmaps_to_list: check disk name once 



Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarAndrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200521220648.3255-6-vsementsov@virtuozzo.com>
[eblake: shorter subject line]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent ae00aa23

migration/block-dirty-bitmap.c

+11 −6
Original line number Diff line number Diff line
@@ -274,17 +274,22 @@ static int add_bitmaps_to_list(BlockDriverState *bs, const char *bs_name) 
    DirtyBitmapMigBitmapState *dbms;

    Error *local_err = NULL;



    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {

        if (!bdrv_dirty_bitmap_name(bitmap)) {

            continue;

    bitmap = bdrv_dirty_bitmap_first(bs);

    if (!bitmap) {

        return 0;

    }



    if (!bs_name || strcmp(bs_name, "") == 0) {

            error_report("Found bitmap '%s' in unnamed node %p. It can't "

                         "be migrated", bdrv_dirty_bitmap_name(bitmap), bs);

        error_report("Bitmap '%s' in unnamed node can't be migrated",

                     bdrv_dirty_bitmap_name(bitmap));

        return -1;

    }



    FOR_EACH_DIRTY_BITMAP(bs, bitmap) {

        if (!bdrv_dirty_bitmap_name(bitmap)) {

            continue;

        }



        if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) {

            error_report_err(local_err);

            return -1;