Skip to contentSkip to conversation

dirty-bitmaps: remove deprecated autoload parameter

PATCH Superseded John Snow 4 participants 7 messages Sep 24, 2019 – Oct 29, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

John Snow

author
#0 lore raw

cover dirty-bitmaps: remove deprecated autoload parameter

I'm going to be honest, here. There's actually no real reason to remove this now, but we could, so I'm going to.

Also, in terms of the API serving as documentation, it's nicer to not pretend this is an option that does anything, so out it goes.

This will serve as a little smoke test to see what happens if we actually stop dropping features we claimed were deprecated.

John Snow (1):
dirty-bitmaps: remove deprecated autoload parameter

 qemu-deprecated.texi | 20 +++++++++++++++-----
 qapi/block-core.json |  6 +-----
 blockdev.c           |  6 ------
 3 files changed, 16 insertions(+), 16 deletions(-)
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 1/1 dirty-bitmaps: remove deprecated autoload parameter

This parameter has been deprecated since 2.12.0 and is eligible for removal. Remove this parameter as it is actually completely ignored; let's not give false hope.

---
 qemu-deprecated.texi | 20 +++++++++++++++-----
 qapi/block-core.json |  6 +-----
 blockdev.c           |  6 ------
 3 files changed, 16 insertions(+), 16 deletions(-)
qemu-deprecated.texi +15 -5
index 01245e0b1c..d60246d5d6 100644
@@ -149,11 +149,6 @@ QEMU 4.1 has three options, please migrate to one of these three:
 
 @section QEMU Machine Protocol (QMP) commands
 
-@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)
-
-"autoload" parameter is now ignored. All bitmaps are automatically loaded
-from qcow2 images.
-
 @subsection query-block result field dirty-bitmaps[i].status (since 4.0)
 
 The ``status'' field of the ``BlockDirtyInfo'' structure, returned by
@@ -356,3 +351,18 @@ existing CPU models.  Management software that needs runnability
 guarantees must resolve the CPU model aliases using te
 ``alias-of'' field returned by the ``query-cpu-definitions'' QMP
 command.
+
+
+@node Recently removed features
+@appendix Recently removed features
+
+What follows is a record of recently removed, formerly deprecated
+features that serves as a record for users who have encountered
+trouble after a recent upgrade.
+
+@section QEMU Machine Protocol (QMP) commands
+
+@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)
+
+"autoload" parameter is now ignored. All bitmaps are automatically loaded
+from qcow2 images.
qapi/block-core.json +1 -5
index e6edd641f1..e4975ece4a 100644
@@ -1987,10 +1987,6 @@
 #              Qcow2 disks support persistent bitmaps. Default is false for
 #              block-dirty-bitmap-add. (Since: 2.10)
 #
-# @autoload: ignored and deprecated since 2.12.
-#            Currently, all dirty tracking bitmaps are loaded from Qcow2 on
-#            open.
-#
 # @disabled: the bitmap is created in the disabled state, which means that
 #            it will not track drive changes. The bitmap may be enabled with
 #            block-dirty-bitmap-enable. Default is false. (Since: 4.0)
@@ -1999,7 +1995,7 @@
 ##
 { 'struct': 'BlockDirtyBitmapAdd',
   'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32',
-            '*persistent': 'bool', '*autoload': 'bool', '*disabled': 'bool' } }
+            '*persistent': 'bool', '*disabled': 'bool' } }
 
 ##
 # @BlockDirtyBitmapMergeSource:
blockdev.c +0 -6
index fbef6845c8..93804da840 100644
@@ -1966,7 +1966,6 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common,
     qmp_block_dirty_bitmap_add(action->node, action->name,
                                action->has_granularity, action->granularity,
                                action->has_persistent, action->persistent,
-                               action->has_autoload, action->autoload,
                                action->has_disabled, action->disabled,
                                &local_err);
 
@@ -2858,7 +2857,6 @@ out:
 void qmp_block_dirty_bitmap_add(const char *node, const char *name,
                                 bool has_granularity, uint32_t granularity,
                                 bool has_persistent, bool persistent,
-                                bool has_autoload, bool autoload,
                                 bool has_disabled, bool disabled,
                                 Error **errp)
 {
@@ -2890,10 +2888,6 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,
         persistent = false;
     }
 
-    if (has_autoload) {
-        warn_report("Autoload option is deprecated and its value is ignored");
-    }
-
     if (!has_disabled) {
         disabled = false;
     }
Signature · 1 line
2.21.0
Reviewed-by on v1 1/1
#2 lore raw
Quoted 16 lines · John Snow

This parameter has been deprecated since 2.12.0 and is eligible for removal. Remove this parameter as it is actually completely ignored; let's not give false hope.

---
 qemu-deprecated.texi | 20 +++++++++++++++-----
 qapi/block-core.json |  6 +-----
 blockdev.c           |  6 ------
 3 files changed, 16 insertions(+), 16 deletions(-)
qemu-deprecated.texi +0 -0
index 01245e0b1c..d60246d5d6 100644
 

qemu-deprecated.texi existing CPU models. Management software that needs runnability · line 365

Quoted 10 lines
qemu-deprecated.texi +10 -0
+@node Recently removed features
+@appendix Recently removed features
+
+What follows is a record of recently removed, formerly deprecated
+features that serves as a record for users who have encountered
+trouble after a recent upgrade.
+
+@section QEMU Machine Protocol (QMP) commands
+
+@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)

Do we want to state 'since 4.2' here, as the point where it was removed?

Otherwise,

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Reviewed-by on v1 1/1
#3 lore raw
In reply to John Snow
Quoted 33 lines · John Snow

This parameter has been deprecated since 2.12.0 and is eligible for removal. Remove this parameter as it is actually completely ignored; let's not give false hope.

---
  qemu-deprecated.texi | 20 +++++++++++++++-----
  qapi/block-core.json |  6 +-----
  blockdev.c           |  6 ------
  3 files changed, 16 insertions(+), 16 deletions(-)
qemu-deprecated.texi +2 -5
index 01245e0b1c..d60246d5d6 100644
@@ -149,11 +149,6 @@ QEMU 4.1 has three options, please migrate to one of these three:
 
  @section QEMU Machine Protocol (QMP) commands
 
-@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)
-
-"autoload" parameter is now ignored. All bitmaps are automatically loaded
-from qcow2 images.
-
  @subsection query-block result field dirty-bitmaps[i].status (since 4.0)
 
  The ``status'' field of the ``BlockDirtyInfo'' structure, returned by
@@ -356,3 +351,18 @@ existing CPU models.  Management software that needs runnability
  guarantees must resolve the CPU model aliases using te
  ``alias-of'' field returned by the ``query-cpu-definitions'' QMP
  command.
+
+

qemu-deprecated.texi existing CPU models. Management software that needs runnability · line 365

Quoted 10 lines
qemu-deprecated.texi +10 -0
+@node Recently removed features
+@appendix Recently removed features
+
+What follows is a record of recently removed, formerly deprecated
+features that serves as a record for users who have encountered
+trouble after a recent upgrade.
+
+@section QEMU Machine Protocol (QMP) commands
+
+@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)

Agree with Eric that it should be 4.2 - as this section is about removing

qemu-deprecated.texi existing CPU models. Management software that needs runnability · line 368

Quoted 3 lines
qemu-deprecated.texi +3 -0
+
+"autoload" parameter is now ignored. All bitmaps are automatically loaded
+from qcow2 images.

Maybe, rephrase it as s/is now ignored/is now removed (ignored since 2.12.0)/ , so that this paragraph don't mislead without a context.

(Yay, deprecation works!)

Signature · 2 lines
Best regards,
Vladimir
author
#4 lore raw
Quoted 38 lines · Vladimir Sementsov-Ogievskiy
Quoted 37 lines · John Snow

This parameter has been deprecated since 2.12.0 and is eligible for removal. Remove this parameter as it is actually completely ignored; let's not give false hope.

---
  qemu-deprecated.texi | 20 +++++++++++++++-----
  qapi/block-core.json |  6 +-----
  blockdev.c           |  6 ------
  3 files changed, 16 insertions(+), 16 deletions(-)
qemu-deprecated.texi +6 -5
index 01245e0b1c..d60246d5d6 100644
@@ -149,11 +149,6 @@ QEMU 4.1 has three options, please migrate to one of these three:
 
  @section QEMU Machine Protocol (QMP) commands
 
-@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)
-
-"autoload" parameter is now ignored. All bitmaps are automatically loaded
-from qcow2 images.
-
  @subsection query-block result field dirty-bitmaps[i].status (since 4.0)
 
  The ``status'' field of the ``BlockDirtyInfo'' structure, returned by
@@ -356,3 +351,18 @@ existing CPU models.  Management software that needs runnability
  guarantees must resolve the CPU model aliases using te
  ``alias-of'' field returned by the ``query-cpu-definitions'' QMP
  command.
+
+
+@node Recently removed features
+@appendix Recently removed features
+
+What follows is a record of recently removed, formerly deprecated
Quoted 9 lines

qemu-deprecated.texi existing CPU models. Management software that needs runnability · line 365

Quoted 6 lines
qemu-deprecated.texi +6 -0
+features that serves as a record for users who have encountered
+trouble after a recent upgrade.
+
+@section QEMU Machine Protocol (QMP) commands
+
+@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)

Agree with Eric that it should be 4.2 - as this section is about removing

Yes, shame on me. I spent about three seconds on this patch and should have spent four.

Quoted 7 lines

qemu-deprecated.texi existing CPU models. Management software that needs runnability · line 368

Quoted 3 lines
qemu-deprecated.texi +3 -0
+
+"autoload" parameter is now ignored. All bitmaps are automatically loaded
+from qcow2 images.

Maybe, rephrase it as s/is now ignored/is now removed (ignored since 2.12.0)/ , so that this paragraph don't mislead without a context.

Also a good idea.

'The "autoload" parameter has been ignored since 2.12.0. All bitmaps are automatically loaded from qcow2 images.'

Quoted 4 lines

(Yay, deprecation works!)

Thanks, and I'll get to the rest of your pending bitmap patches and cleanups soon.

--js

#5 lore raw
Quoted 62 lines · John Snow
Quoted 38 lines · Vladimir Sementsov-Ogievskiy
Quoted 37 lines · John Snow

This parameter has been deprecated since 2.12.0 and is eligible for removal. Remove this parameter as it is actually completely ignored; let's not give false hope.

---
   qemu-deprecated.texi | 20 +++++++++++++++-----
   qapi/block-core.json |  6 +-----
   blockdev.c           |  6 ------
   3 files changed, 16 insertions(+), 16 deletions(-)
qemu-deprecated.texi +6 -5
index 01245e0b1c..d60246d5d6 100644
@@ -149,11 +149,6 @@ QEMU 4.1 has three options, please migrate to one of these three:
 
   @section QEMU Machine Protocol (QMP) commands
 
-@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)
-
-"autoload" parameter is now ignored. All bitmaps are automatically loaded
-from qcow2 images.
-
   @subsection query-block result field dirty-bitmaps[i].status (since 4.0)
 
   The ``status'' field of the ``BlockDirtyInfo'' structure, returned by
@@ -356,3 +351,18 @@ existing CPU models.  Management software that needs runnability
   guarantees must resolve the CPU model aliases using te
   ``alias-of'' field returned by the ``query-cpu-definitions'' QMP
   command.
+
+
+@node Recently removed features
+@appendix Recently removed features
+
+What follows is a record of recently removed, formerly deprecated
Quoted 9 lines

qemu-deprecated.texi existing CPU models. Management software that needs runnability · line 365

Quoted 6 lines
qemu-deprecated.texi +6 -0
+features that serves as a record for users who have encountered
+trouble after a recent upgrade.
+
+@section QEMU Machine Protocol (QMP) commands
+
+@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)

Agree with Eric that it should be 4.2 - as this section is about removing

Yes, shame on me. I spent about three seconds on this patch and should have spent four.

Quoted 7 lines

qemu-deprecated.texi existing CPU models. Management software that needs runnability · line 368

Quoted 3 lines
qemu-deprecated.texi +3 -0
+
+"autoload" parameter is now ignored. All bitmaps are automatically loaded
+from qcow2 images.

Maybe, rephrase it as s/is now ignored/is now removed (ignored since 2.12.0)/ , so that this paragraph don't mislead without a context.

Quoted 4 lines

Also a good idea.

'The "autoload" parameter has been ignored since 2.12.0. All bitmaps are automatically loaded from qcow2 images.'

OK

Quoted 9 lines
Quoted 5 lines

(Yay, deprecation works!)

Thanks, and I'll get to the rest of your pending bitmap patches and cleanups soon.

That's great!

Signature · 2 lines
Best regards,
Vladimir
#6 lore raw
In reply to John Snow
Quoted 9 lines · John Snow

I'm going to be honest, here. There's actually no real reason to remove this now, but we could, so I'm going to.

Also, in terms of the API serving as documentation, it's nicer to not pretend this is an option that does anything, so out it goes.

This will serve as a little smoke test to see what happens if we actually stop dropping features we claimed were deprecated.

Quoted 7 lines

John Snow (1):
dirty-bitmaps: remove deprecated autoload parameter

 qemu-deprecated.texi | 20 +++++++++++++++-----
 qapi/block-core.json |  6 +-----
 blockdev.c           |  6 ------
 3 files changed, 16 insertions(+), 16 deletions(-)

Cleaning up my inbox... Was it your intention for someone other than yourself to take this patch? :S

Max