[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 2/4] block/dirty-bitmap: add inconsistent status
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v2 2/4] block/dirty-bitmap: add inconsistent status |
Date: |
Fri, 22 Feb 2019 19:22:07 -0500 |
Even though the status field is deprecated, we still have to support
it for a few more releases. Since this is a very new kind of bitmap
state, it makes sense for it to have its own status field.
Signed-off-by: John Snow <address@hidden>
---
block/dirty-bitmap.c | 7 ++++++-
qapi/block-core.json | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 9042c04788..4e8f931659 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -209,10 +209,15 @@ bool bdrv_dirty_bitmap_enabled(BdrvDirtyBitmap *bitmap)
* or it can be Disabled and not recording writes.
* (4) Locked: Whether Active or Disabled, the user cannot modify this bitmap
* in any way from the monitor.
+ * (5) Inconsistent: This is a persistent bitmap whose "in use" bit is set, and
+ * is unusable by QEMU. It can be deleted to remove it from
+ * the qcow2.
*/
DirtyBitmapStatus bdrv_dirty_bitmap_status(BdrvDirtyBitmap *bitmap)
{
- if (bdrv_dirty_bitmap_has_successor(bitmap)) {
+ if (bdrv_dirty_bitmap_inconsistent(bitmap)) {
+ return DIRTY_BITMAP_STATUS_INCONSISTENT;
+ } else if (bdrv_dirty_bitmap_has_successor(bitmap)) {
return DIRTY_BITMAP_STATUS_FROZEN;
} else if (bdrv_dirty_bitmap_busy(bitmap)) {
return DIRTY_BITMAP_STATUS_LOCKED;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index a7209fce22..b25ca6a6c1 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -442,10 +442,15 @@
# recording new writes. If the bitmap was @disabled, it is not
# recording new writes. (Since 2.12)
#
+# @inconsistent: This is a persistent dirty bitmap that was marked in-use on
+# disk, and is unusable by QEMU. It can only be deleted.
+# Please rely on the inconsistent field in @BlockDirtyInfo
+# instead, as the status field is deprecated. (Since 4.0)
+#
# Since: 2.4
##
{ 'enum': 'DirtyBitmapStatus',
- 'data': ['active', 'disabled', 'frozen', 'locked'] }
+ 'data': ['active', 'disabled', 'frozen', 'locked', 'inconsistent'] }
##
# @BlockDirtyInfo:
--
2.17.2
- [Qemu-block] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, (continued)
- [Qemu-block] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, John Snow, 2019/02/22
- Re: [Qemu-block] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, Eric Blake, 2019/02/25
- Re: [Qemu-block] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, Vladimir Sementsov-Ogievskiy, 2019/02/25
- Re: [Qemu-block] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, Vladimir Sementsov-Ogievskiy, 2019/02/25
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, John Snow, 2019/02/27
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, Vladimir Sementsov-Ogievskiy, 2019/02/28
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, Eric Blake, 2019/02/28
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, Vladimir Sementsov-Ogievskiy, 2019/02/28
- Re: [Qemu-block] [PATCH v2 1/4] block/dirty-bitmaps: add inconsistent bit, John Snow, 2019/02/25
[Qemu-block] [PATCH] dirty-bitmap: introduce inconsistent bitmaps, Vladimir Sementsov-Ogievskiy, 2019/02/25
[Qemu-block] [PATCH v2 2/4] block/dirty-bitmap: add inconsistent status,
John Snow <=
[Qemu-block] [PATCH v2 4/4] block/dirty-bitmaps: implement inconsistent bit, John Snow, 2019/02/22
[Qemu-block] [PATCH v2 3/4] block/dirty-bitmaps: add block_dirty_bitmap_check function, John Snow, 2019/02/22