[Qemu-commits] [qemu/qemu] 0d1e45: migration: dirty-bitmap: Use struct for alias map ...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 0d1e450c7b3117ee635a00c81d9a92666ebc7ffa
      
https://github.com/qemu/qemu/commit/0d1e450c7b3117ee635a00c81d9a92666ebc7ffa
  Author: Peter Krempa <pkrempa@redhat.com>
  Date:   2021-02-12 (Fri, 12 Feb 2021)

  Changed paths:
    M migration/block-dirty-bitmap.c

  Log Message:
  -----------
  migration: dirty-bitmap: Use struct for alias map inner members

Currently the alias mapping hash stores just strings of the target
objects internally. In further patches we'll be adding another member
which will need to be stored in the map so pass a copy of the whole
BitmapMigrationBitmapAlias QAPI struct into the map.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Message-Id: 
<fc5f27e1fe16cb75e08a248c2d938de3997b9bfb.1613150869.git.pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: adjust long lines]
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 6e9f21a2aa8a78bc9a512a836a40c79fe50dd2b4
      
https://github.com/qemu/qemu/commit/6e9f21a2aa8a78bc9a512a836a40c79fe50dd2b4
  Author: Peter Krempa <pkrempa@redhat.com>
  Date:   2021-02-12 (Fri, 12 Feb 2021)

  Changed paths:
    M migration/block-dirty-bitmap.c
    M qapi/migration.json

  Log Message:
  -----------
  migration: dirty-bitmap: Allow control of bitmap persistence

Bitmap's source persistence is transported over the migration stream and
the destination mirrors it. In some cases the destination might want to
persist bitmaps which are not persistent on the source (e.g. the result
of merging bitmaps from a number of layers on the source when migrating
into a squashed image) but currently it would need to create another set
of persistent bitmaps and merge them.

This patch adds a 'transform' property to the alias map which allows
overriding the persistence of migrated bitmaps both on the source and
destination sides.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Message-Id: 
<b20afb675917b86f6359ac3591166ac6d4233573.1613150869.git.pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: grammar tweaks, drop dead conditional]
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: ca4bfec41d56a1154da89b105048b3462361d0f0
      
https://github.com/qemu/qemu/commit/ca4bfec41d56a1154da89b105048b3462361d0f0
  Author: Peter Krempa <pkrempa@redhat.com>
  Date:   2021-02-12 (Fri, 12 Feb 2021)

  Changed paths:
    M tests/qemu-iotests/300
    M tests/qemu-iotests/300.out

  Log Message:
  -----------
  qemu-iotests: 300: Add test case for modifying persistence of bitmap

Verify that the modification of the bitmap persistence over migration
which is controlled via BitmapMigrationBitmapAliasTransform works
properly.

Based on TestCrossAliasMigration

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Message-Id: 
<d9c8e9827e9b6001b2dd1b92e64aab858e6d2a86.1613150869.git.pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: Adjust test for explicit read_zeroes=False]
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: a1e708fcda5eab10c866a7d6a4fad4f80b69ad15
      
https://github.com/qemu/qemu/commit/a1e708fcda5eab10c866a7d6a4fad4f80b69ad15
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-02-12 (Fri, 12 Feb 2021)

  Changed paths:
    M block.c
    M include/block/block.h

  Log Message:
  -----------
  block: return status from bdrv_append and friends

The recommended use of qemu error api assumes returning status together
with setting errp and avoid void functions with errp parameter. Let's
improve bdrv_append and some friends to reduce error-propagation
overhead in further patches.

Choose int return status, because bdrv_replace_node_common() has call
to bdrv_check_update_perm(), which reports int status, which seems
correct to propagate.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210202124956.63146-2-vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 934aee14d36e67468260635af61c387227cdaf78
      
https://github.com/qemu/qemu/commit/934aee14d36e67468260635af61c387227cdaf78
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-02-12 (Fri, 12 Feb 2021)

  Changed paths:
    M block.c
    M block/backup-top.c
    M block/commit.c
    M block/mirror.c
    M blockdev.c
    M tests/test-bdrv-graph-mod.c

  Log Message:
  -----------
  block: use return status of bdrv_append()

Now bdrv_append returns status and we can drop all the local_err things
around it.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20210202124956.63146-3-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 392b9a74b9b621c52d05e37bc6f41f1bbab5c6f8
      
https://github.com/qemu/qemu/commit/392b9a74b9b621c52d05e37bc6f41f1bbab5c6f8
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-02-13 (Sat, 13 Feb 2021)

  Changed paths:
    M block.c
    M block/backup-top.c
    M block/commit.c
    M block/mirror.c
    M blockdev.c
    M include/block/block.h
    M migration/block-dirty-bitmap.c
    M qapi/migration.json
    M tests/qemu-iotests/300
    M tests/qemu-iotests/300.out
    M tests/test-bdrv-graph-mod.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2021-02-12' 
into staging

bitmaps patches for 2021-02-12

- add 'transform' member to manipulate bitmaps across migration
- work towards better error handling during bdrv_open

# gpg: Signature made Fri 12 Feb 2021 23:19:39 GMT
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-bitmaps-2021-02-12:
  block: use return status of bdrv_append()
  block: return status from bdrv_append and friends
  qemu-iotests: 300: Add test case for modifying persistence of bitmap
  migration: dirty-bitmap: Allow control of bitmap persistence
  migration: dirty-bitmap: Use struct for alias map inner members

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/f4ceebdec531...392b9a74b9b6