| Message ID | 20231013104736.31722-5-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Migration deprecated parts | expand |
Juan Quintela <quintela@redhat.com> writes: > Set the 'block' migration capability to 'true' instead. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > Acked-by: Stefan Hajnoczi <stefanha@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > > --- > > Improve documentation and style (markus) > --- > docs/about/deprecated.rst | 7 +++++++ > qapi/migration.json | 6 ++++-- > migration/migration.c | 5 +++++ > 3 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 1b6b2870cf..e6928b96cf 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -459,3 +459,10 @@ The new way to modify migration is using migration parameters. > ``inc`` functionality can be achieved by setting the > ``block-incremental`` migration parameter to ``true``. > > +``blk`` migrate command option (since 8.2) > +'''''''''''''''''''''''''''''''''''''''''' > + > +The new way to modify migration is using migration parameters. > +``blk`` functionality can be achieved by setting the > +``block`` migration capability to ``true``. > + > diff --git a/qapi/migration.json b/qapi/migration.json > index 56bbd55b87..64ebced761 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -1495,7 +1495,8 @@ > # Features: > # > # @deprecated: Member @inc is deprecated. Use migration parameter > -# @block-incremental instead. > +# @block-incremental instead. Member @blk is deprecated. Set Two spaces between sentences for consistency. > +# migration capability 'block' to 'true' instead. > # > # Returns: nothing on success > # > @@ -1518,7 +1519,8 @@ > # <- { "return": {} } > ## > { 'command': 'migrate', > - 'data': {'uri': 'str', '*blk': 'bool', > + 'data': {'uri': 'str', > + '*blk': { 'type': 'bool', 'features': [ 'deprecated' ] }, > '*inc': { 'type': 'bool', 'features': [ 'deprecated' ] }, > '*detach': 'bool', '*resume': 'bool' } } > > diff --git a/migration/migration.c b/migration/migration.c > index ac4897fe0d..9e4ae6b772 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1607,6 +1607,11 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, > " instead."); > } > > + if (blk) { > + warn_report("@blk/-i migrate option is deprecated, set the " > + "'block' capability to 'true' instead."); > + } > + > if (resume) { > if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) { > error_setg(errp, "Cannot resume if there is no " My comments for PATCH 01 apply.
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1b6b2870cf..e6928b96cf 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -459,3 +459,10 @@ The new way to modify migration is using migration parameters. ``inc`` functionality can be achieved by setting the ``block-incremental`` migration parameter to ``true``. +``blk`` migrate command option (since 8.2) +'''''''''''''''''''''''''''''''''''''''''' + +The new way to modify migration is using migration parameters. +``blk`` functionality can be achieved by setting the +``block`` migration capability to ``true``. + diff --git a/qapi/migration.json b/qapi/migration.json index 56bbd55b87..64ebced761 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1495,7 +1495,8 @@ # Features: # # @deprecated: Member @inc is deprecated. Use migration parameter -# @block-incremental instead. +# @block-incremental instead. Member @blk is deprecated. Set +# migration capability 'block' to 'true' instead. # # Returns: nothing on success # @@ -1518,7 +1519,8 @@ # <- { "return": {} } ## { 'command': 'migrate', - 'data': {'uri': 'str', '*blk': 'bool', + 'data': {'uri': 'str', + '*blk': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*inc': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*detach': 'bool', '*resume': 'bool' } } diff --git a/migration/migration.c b/migration/migration.c index ac4897fe0d..9e4ae6b772 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1607,6 +1607,11 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, " instead."); } + if (blk) { + warn_report("@blk/-i migrate option is deprecated, set the " + "'block' capability to 'true' instead."); + } + if (resume) { if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) { error_setg(errp, "Cannot resume if there is no "