Re: [PATCH v2 2/5] migretion/block-dirty-bitmap: refactor init_dirty_bitmap_migration

[Eric Blake]

On 12/19/19 2:51 AM, Vladimir Sementsov-Ogievskiy wrote:

In the subject: s/migretion/migration/

> Split out handling one bs, it is needed for the following commit, which
> will handle BlockBackends in separate.

s/in separate/separately/

> Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> ---
>   migration/block-dirty-bitmap.c | 89 +++++++++++++++++++---------------
>   1 file changed, 49 insertions(+), 40 deletions(-)

> +++ b/migration/block-dirty-bitmap.c
> @@ -268,57 +268,66 @@ static void dirty_bitmap_mig_cleanup(void)

>   
> -    for (bs = bdrv_next_all_states(NULL); bs; bs = bdrv_next_all_states(bs)) {
> -        const char *name = bdrv_get_device_or_node_name(bs);
> +        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() generally avoids multiple sentences.

> +            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;
> +        }
>   
> -            if (!name || strcmp(name, "") == 0) {
> -                error_report("Found bitmap '%s' in unnamed node %p. It can't "
> -                             "be migrated", bdrv_dirty_bitmap_name(bitmap), 
> bs);

But as this was just code motion,

Reviewed-by: Eric Blake <address@hidden>

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