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.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
 qapi/block-core.json | 7 ++++++-
 block/dirty-bitmap.c | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index e639ef6d1c..ae55cd0704 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:
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 9e8630e1ac..71e0098396 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;
-- 
2.17.2

01.03.2019 22:15, John Snow wrote:
> 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.
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>   qapi/block-core.json | 7 ++++++-
>   block/dirty-bitmap.c | 7 ++++++-
>   2 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index e639ef6d1c..ae55cd0704 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:
> diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
> index 9e8630e1ac..71e0098396 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

"was", like in qapi is better than "is", as while qemu running other (not inconsistent)
bitmaps' IN_USE bit is also set..

but I don't really care about deprecated comment:), anyway:

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

> + *                   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;
> 


-- 
Best regards,
Vladimir

On 3/6/19 8:05 AM, Vladimir Sementsov-Ogievskiy wrote:
> 01.03.2019 22:15, John Snow wrote:
>> 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.
>>
>> Reviewed-by: Eric Blake <eblake@redhat.com>
>> Signed-off-by: John Snow <jsnow@redhat.com>
>> ---
>>   qapi/block-core.json | 7 ++++++-
>>   block/dirty-bitmap.c | 7 ++++++-
>>   2 files changed, 12 insertions(+), 2 deletions(-)
>>
>> diff --git a/qapi/block-core.json b/qapi/block-core.json
>> index e639ef6d1c..ae55cd0704 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:
>> diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
>> index 9e8630e1ac..71e0098396 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
> 
> "was", like in qapi is better than "is", as while qemu running other (not inconsistent)
> bitmaps' IN_USE bit is also set..
> 
> but I don't really care about deprecated comment:), anyway:
> 
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Hm, this is a weird English thing. "Was set" references some event in
the past but doesn't necessarily imply that it is still set. "is set"
implies that it is still currently set, which I think is correct.

But, I don't care much about the deprecated comment either :)