vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bitmaps patches for 2020-07-17 

- improve corner-case of bitmap migration
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAl8Rv08ACgkQp6FrSiUn
 Q2qkJQf+JV4Q/Wl3obSn5k2ClH2NbsEsd/sYwheb2ZKZHWf/oV2M5/YPwDgCIoNC
 ahj7qJzTl+E8zlf6YgfRhopNMOd8Mg1gcqTegeAOmlKZ03xy6rFOcl94Osi+jFeH
 edOyjvjfSGXLZxFzFr9/YMe/P0E+gLWQ5hb9a5uSISZdSvAIx/S97hyYizzsdWK6
 Fe2nq/VcI7uHoO+25wtS/y3vgr72TGmg1PnEwSoKEg8ogyD6aNhnpmtNygrRPQGV
 0bDr23i5A7/pleESCXSrXp/sW2yehTuPChcUqQZnxU1wHLIMsRyFE2tFJg9yMxB6
 FLt9AVcGKmVeAHx4k9GpUox06mmmHw==
 =dnzH
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-07-17' into staging

bitmaps patches for 2020-07-17

- improve corner-case of bitmap migration

# gpg: Signature made Fri 17 Jul 2020 16:10:07 BST
# 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-2020-07-17:
  migration/block-dirty-bitmap: fix add_bitmaps_to_list

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Peter Maydell 2020-07-18 22:24:34 +01:00
parent 97f750beca 7cb015197b
commit 939ab64b40
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/block-dirty-bitmap.c
View File

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