mirror of https://gitlab.com/qemu-project/qemu
block/qcow2-bitmap: fix bitmap migration
Fix bitmap migration with dirty-bitmaps capability enabled and shared
storage. We should ignore IN_USE bitmaps in the image on target, when
migrating bitmaps through migration channel, see new comment below.
Fixes: 74da6b9435
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191125125229.13531-2-vsementsov@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
4ecc984210
commit
a505475b95
|
@ -988,7 +988,26 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
QSIMPLEQ_FOREACH(bm, bm_list, entry) {
|
QSIMPLEQ_FOREACH(bm, bm_list, entry) {
|
||||||
BdrvDirtyBitmap *bitmap = load_bitmap(bs, bm, errp);
|
BdrvDirtyBitmap *bitmap;
|
||||||
|
|
||||||
|
if ((bm->flags & BME_FLAG_IN_USE) &&
|
||||||
|
bdrv_find_dirty_bitmap(bs, bm->name))
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* We already have corresponding BdrvDirtyBitmap, and bitmap in the
|
||||||
|
* image is marked IN_USE. Firstly, this state is valid, no reason
|
||||||
|
* to consider existing BdrvDirtyBitmap to be bad. Secondly it's
|
||||||
|
* absolutely possible, when we do migration with shared storage
|
||||||
|
* with dirty-bitmaps capability enabled: if the bitmap was loaded
|
||||||
|
* from this storage before migration start, the storage will
|
||||||
|
* of-course contain IN_USE outdated version of the bitmap, and we
|
||||||
|
* should not load it on migration target, as we already have this
|
||||||
|
* bitmap, being migrated.
|
||||||
|
*/
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
bitmap = load_bitmap(bs, bm, errp);
|
||||||
if (bitmap == NULL) {
|
if (bitmap == NULL) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue