Commit 3264ffce authored by John Snow's avatar John Snow
Browse files

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.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20191002232411.29968-1-jsnow@redhat.com
parent 4a189fdf

blockdev.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

    }

qapi/block-core.json

+1 −5
Original line number Diff line number Diff line
@@ -2052,10 +2052,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)
@@ -2064,7 +2060,7 @@ 
##

{ 'struct': 'BlockDirtyBitmapAdd',

  'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32',

            '*persistent': 'bool', '*autoload': 'bool', '*disabled': 'bool' } }

            '*persistent': 'bool', '*disabled': 'bool' } }



##

# @BlockDirtyBitmapMergeSource:

qemu-deprecated.texi

+15 −5
Original line number Diff line number Diff line
@@ -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 4.2.0)



The "autoload" parameter has been ignored since 2.12.0. All bitmaps

are automatically loaded from qcow2 images.