[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/4] qcow2: fix bitmaps loading when bitmaps already
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 2/4] qcow2: fix bitmaps loading when bitmaps already exist |
Date: |
Mon, 26 Mar 2018 22:20:37 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
On reopen with existing bitmaps, instead of loading bitmaps, lets
reopen them if needed. This also fixes bitmaps migration through
shared storage.
Consider the case. Persistent bitmaps are stored on bdrv_inactivate.
Then, on destination process_incoming_migration_bh() calls
bdrv_invalidate_cache_all() which leads to
qcow2_load_autoloading_dirty_bitmaps() which fails if bitmaps are
already loaded on destination start.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index cf4f3becae..486f3e83b7 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1480,7 +1480,22 @@ static int coroutine_fn qcow2_do_open(BlockDriverState
*bs, QDict *options,
s->autoclear_features &= QCOW2_AUTOCLEAR_MASK;
}
- if (qcow2_load_dirty_bitmaps(bs, &local_err)) {
+ if (bdrv_dirty_bitmap_next(bs, NULL)) {
+ /* It's some kind of reopen with already existing dirty bitmaps. There
+ * are no known cases where we need loading bitmaps in such situation,
+ * so it's safer don't load them.
+ *
+ * Moreover, if we have some readonly bitmaps and we are reopening for
+ * rw we should reopen bitmaps correspondingly.
+ */
+ if (bdrv_has_readonly_bitmaps(bs) &&
+ !bdrv_is_read_only(bs) && !(bdrv_get_flags(bs) & BDRV_O_INACTIVE))
+ {
+ bool header_updated = false;
+ qcow2_reopen_bitmaps_rw_hint(bs, &header_updated, &local_err);
+ update_header = update_header && !header_updated;
+ }
+ } else if (qcow2_load_dirty_bitmaps(bs, &local_err)) {
update_header = false;
}
if (local_err != NULL) {
--
2.14.3
- [Qemu-devel] [PULL 0/4] Block patches for 2.12.0-rc1, Max Reitz, 2018/03/26
- [Qemu-devel] [PULL 2/4] qcow2: fix bitmaps loading when bitmaps already exist,
Max Reitz <=
- [Qemu-devel] [PULL 1/4] qcow2-bitmap: add qcow2_reopen_bitmaps_rw_hint(), Max Reitz, 2018/03/26
- [Qemu-devel] [PULL 4/4] vmdk: return ERROR when cluster sector is larger than vmdk limitation, Max Reitz, 2018/03/26
- [Qemu-devel] [PULL 3/4] iotests: enable shared migration cases in 169, Max Reitz, 2018/03/26
- Re: [Qemu-devel] [PULL 0/4] Block patches for 2.12.0-rc1, Peter Maydell, 2018/03/27
- Re: [Qemu-devel] [PULL 0/4] Block patches for 2.12.0-rc1, no-reply, 2018/03/31