|
 |
383d26 |
From 03544f6a149a35f62d97106fd5320f8b53cbc085 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Date: Thu, 24 Jan 2019 00:55:11 +0100
|
|
|
383d26 |
Subject: [PATCH 6/8] block/dirty-bitmap: remove assertion from restore
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-id: <20190124005511.27662-3-jsnow@redhat.com>
|
|
|
383d26 |
Patchwork-id: 84104
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 2/2] block/dirty-bitmap: remove assertion from restore
|
|
|
383d26 |
Bugzilla: 1658426
|
|
|
383d26 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
When making a backup of a dirty bitmap (for transactions), we want to
|
|
|
383d26 |
restore that backup whether or not the bitmap is enabled.
|
|
|
383d26 |
|
|
|
383d26 |
It is perfectly valid to write into bitmaps that are disabled. It is
|
|
|
383d26 |
only illegitimate for the guest to have done so.
|
|
|
383d26 |
|
|
|
383d26 |
Remove this assertion.
|
|
|
383d26 |
|
|
|
383d26 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
383d26 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-Id: <20181221093529.23855-3-jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
(cherry picked from commit 07d5a8df6a0018d831baef6d50f53f31a06b5a60)
|
|
|
383d26 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
block/dirty-bitmap.c | 1 -
|
|
|
383d26 |
1 file changed, 1 deletion(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
|
|
|
383d26 |
index f580c1a..bc662d3 100644
|
|
|
383d26 |
--- a/block/dirty-bitmap.c
|
|
|
383d26 |
+++ b/block/dirty-bitmap.c
|
|
|
383d26 |
@@ -610,7 +610,6 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out)
|
|
|
383d26 |
void bdrv_undo_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *in)
|
|
|
383d26 |
{
|
|
|
383d26 |
HBitmap *tmp = bitmap->bitmap;
|
|
|
383d26 |
- assert(bdrv_dirty_bitmap_enabled(bitmap));
|
|
|
383d26 |
assert(!bdrv_dirty_bitmap_readonly(bitmap));
|
|
|
383d26 |
bitmap->bitmap = in;
|
|
|
383d26 |
hbitmap_free(tmp);
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|