[PULL 0/1] bitmaps patches for 2020-07-17 [-rc1]

[PULL 0/1] bitmaps patches for 2020-07-17 [-rc1]

[Eric Blake]

The following changes since commit 151f76c689b1ff4c2c59e6d8469a0d4fe5346f55:

  Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging (2020-07-16 21:46:18 +0100)

are available in the Git repository at:

  https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2020-07-17

for you to fetch changes up to 7cb015197b383a62f5729d2c92b1050db0185c1c:

  migration/block-dirty-bitmap: fix add_bitmaps_to_list (2020-07-17 08:18:51 -0500)

I had been waiting to see if I had more than one patch to bundle, but
given that we are now coming up on -rc1 and this is a bugfix, it's time
for the pull request of this in isolation.

----------------------------------------------------------------
bitmaps patches for 2020-07-17

- improve corner-case of bitmap migration

----------------------------------------------------------------
Vladimir Sementsov-Ogievskiy (1):
      migration/block-dirty-bitmap: fix add_bitmaps_to_list

 migration/block-dirty-bitmap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.27.0

[PULL 1/1] migration/block-dirty-bitmap: fix add_bitmaps_to_list

[Eric Blake]

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

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@virtuozzo.com>
Message-Id: <20200626130658.76498-1-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: commit message grammar tweaks]
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 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 47bc0f650c1e..b0dbf9eeed43 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;
     }
-- 
2.27.0

Re: [PULL 0/1] bitmaps patches for 2020-07-17 [-rc1]

[Peter Maydell]

On Fri, 17 Jul 2020 at 16:17, Eric Blake <eblake@redhat.com> wrote:
>
> The following changes since commit 151f76c689b1ff4c2c59e6d8469a0d4fe5346f55:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging (2020-07-16 21:46:18 +0100)
>
> are available in the Git repository at:
>
>   https://repo.or.cz/qemu/ericb.git tags/pull-bitmaps-2020-07-17
>
> for you to fetch changes up to 7cb015197b383a62f5729d2c92b1050db0185c1c:
>
>   migration/block-dirty-bitmap: fix add_bitmaps_to_list (2020-07-17 08:18:51 -0500)
>
> I had been waiting to see if I had more than one patch to bundle, but
> given that we are now coming up on -rc1 and this is a bugfix, it's time
> for the pull request of this in isolation.
>
> ----------------------------------------------------------------
> bitmaps patches for 2020-07-17
>
> - improve corner-case of bitmap migration
>
> ----------------------------------------------------------------
> Vladimir Sementsov-Ogievskiy (1):
>       migration/block-dirty-bitmap: fix add_bitmaps_to_list


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM