| Message ID | 20231017115238.18309-5-quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Migration deprecated parts | expand |
Juan Quintela <quintela@redhat.com> writes: > It is obsolete. It is better to use driver-mirror with NBD instead. > > CC: Kevin Wolf <kwolf@redhat.com> > CC: Eric Blake <eblake@redhat.com> > CC: Stefan Hajnoczi <stefanha@redhat.com> > CC: Hanna Czenczek <hreitz@redhat.com> > > Signed-off-by: Juan Quintela <quintela@redhat.com> > Acked-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > docs/about/deprecated.rst | 10 ++++++++++ > qapi/migration.json | 29 ++++++++++++++++++++++++----- > migration/block.c | 3 +++ > migration/options.c | 9 ++++++++- > 4 files changed, 45 insertions(+), 6 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 0149f040b6..5eaf096040 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -479,3 +479,13 @@ As an intermediate step the ``blk`` functionality can be achieved by > setting the ``block`` migration capability to ``true``. > But this capability is also deprecated. > > +block migration (since 8.2) > +''''''''''''''''''''''''''' > + > +Block migration is too inflexible. It needs to migrate all block > +devices or none. > + > +Please see "QMP invocation for live storage migration with > +``blockdev-mirror`` + NBD" in docs/interop/live-block-operations.rst > +for a detailed explanation. > + > diff --git a/qapi/migration.json b/qapi/migration.json > index 59a07b50f0..c7633b22c0 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -269,11 +269,15 @@ > # average memory load of the virtual CPU indirectly. Note that > # zero means guest doesn't dirty memory. (Since 8.1) > # > +# Features: > +# > +# @deprecated: Member @disk is deprecated because block migration is. > +# > # Since: 0.14 > ## > { 'struct': 'MigrationInfo', > 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationStats', > - '*disk': 'MigrationStats', > + '*disk': { 'type': 'MigrationStats', 'features': [ 'deprecated' ] }, > '*vfio': 'VfioStats', > '*xbzrle-cache': 'XBZRLECacheStats', > '*total-time': 'int', > @@ -525,6 +529,9 @@ > # > # Features: > # > +# @deprecated: Member @block is deprecated. Use blockdev-mirror with > +# NBD instead. > +# > # @unstable: Members @x-colo and @x-ignore-shared are experimental. > # > # Since: 1.2 > @@ -534,7 +541,8 @@ > 'compress', 'events', 'postcopy-ram', > { 'name': 'x-colo', 'features': [ 'unstable' ] }, > 'release-ram', > - 'block', 'return-path', 'pause-before-switchover', 'multifd', > + { 'name': 'block', 'features': [ 'deprecated' ] }, > + 'return-path', 'pause-before-switchover', 'multifd', > 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate', > { 'name': 'x-ignore-shared', 'features': [ 'unstable' ] }, > 'validate-uuid', 'background-snapshot', > @@ -835,6 +843,9 @@ > # > # Features: > # > +# @deprecated: Member @block-incremental is deprecated. Use Two spaces between sentences for consistency, please. > +# blockdev-mirror with NBD instead. > +# > # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period > # are experimental. > # > @@ -850,7 +861,7 @@ > 'tls-creds', 'tls-hostname', 'tls-authz', 'max-bandwidth', > 'avail-switchover-bandwidth', 'downtime-limit', > { 'name': 'x-checkpoint-delay', 'features': [ 'unstable' ] }, > - 'block-incremental', > + { 'name': 'block-incremental', 'features': [ 'deprecated' ] }, > 'multifd-channels', > 'xbzrle-cache-size', 'max-postcopy-bandwidth', > 'max-cpu-throttle', 'multifd-compression', > @@ -1011,6 +1022,9 @@ > # > # Features: > # > +# @deprecated: Member @block-incremental is deprecated. Use Likewise. > +# blockdev-mirror with NBD instead. > +# > # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period > # are experimental. > # > @@ -1040,7 +1054,8 @@ > '*downtime-limit': 'uint64', > '*x-checkpoint-delay': { 'type': 'uint32', > 'features': [ 'unstable' ] }, > - '*block-incremental': 'bool', > + '*block-incremental': { 'type': 'bool', > + 'features': [ 'deprecated' ] }, > '*multifd-channels': 'uint8', > '*xbzrle-cache-size': 'size', > '*max-postcopy-bandwidth': 'size', > @@ -1225,6 +1240,9 @@ > # > # Features: > # > +# @deprecated: Member @block-incremental is deprecated. Use Likewise. > +# blockdev-mirror with NBD instead. > +# > # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period > # are experimental. > # > @@ -1251,7 +1269,8 @@ > '*downtime-limit': 'uint64', > '*x-checkpoint-delay': { 'type': 'uint32', > 'features': [ 'unstable' ] }, > - '*block-incremental': 'bool', > + '*block-incremental': { 'type': 'bool', > + 'features': [ 'deprecated' ] }, > '*multifd-channels': 'uint8', > '*xbzrle-cache-size': 'size', > '*max-postcopy-bandwidth': 'size', > diff --git a/migration/block.c b/migration/block.c > index b60698d6e2..7682f4fbd2 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -731,6 +731,9 @@ static int block_save_setup(QEMUFile *f, void *opaque) > trace_migration_block_save("setup", block_mig_state.submitted, > block_mig_state.transferred); > > + warn_report("block migration is deprecated. Use blockdev-mirror with" > + "NBD instead."); warn_report("block migration is deprecated;" " use blockdev-mirror with NBD instead."); > + > ret = init_blk_migration(f); > if (ret < 0) { > return ret; > diff --git a/migration/options.c b/migration/options.c > index 42fb818956..0d0a3f8edb 100644 > --- a/migration/options.c > +++ b/migration/options.c > @@ -12,6 +12,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/error-report.h" > #include "exec/target_page.h" > #include "qapi/clone-visitor.h" > #include "qapi/error.h" > @@ -473,10 +474,14 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp) > if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { > error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) " > "block migration"); > - error_append_hint(errp, "Use drive_mirror+NBD instead.\n"); > + error_append_hint(errp, "Use blockdev-mirror with NBD instead.\n"); > return false; > } > #endif > + if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { > + warn_report("Block migration is deprecated. " > + "Use blockdev-mirror with NBD instead."); Likewise. > + } > > #ifndef CONFIG_REPLICATION > if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { > @@ -1386,6 +1391,8 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > } > > if (params->has_block_incremental) { > + warn_report("Block migration is deprecated. " > + "Use blockdev-mirror with NBD instead."); Likewise. > s->parameters.block_incremental = params->block_incremental; > } > if (params->has_multifd_channels) { Other than that Reviewed-by: Markus Armbruster <armbru@redhat.com>
Markus Armbruster <armbru@redhat.com> wrote: > Juan Quintela <quintela@redhat.com> writes: > >> # >> +# @deprecated: Member @block-incremental is deprecated. Use > > Two spaces between sentences for consistency, please. Done. At least here I did the copy and paste right. >> diff --git a/migration/block.c b/migration/block.c >> index b60698d6e2..7682f4fbd2 100644 >> --- a/migration/block.c >> +++ b/migration/block.c >> @@ -731,6 +731,9 @@ static int block_save_setup(QEMUFile *f, void *opaque) >> trace_migration_block_save("setup", block_mig_state.submitted, >> block_mig_state.transferred); >> >> + warn_report("block migration is deprecated. Use blockdev-mirror with" >> + "NBD instead."); > > warn_report("block migration is deprecated;" > " use blockdev-mirror with NBD instead."); Done. >> + if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { >> + warn_report("Block migration is deprecated. " >> + "Use blockdev-mirror with NBD instead."); > > Likewise. > >> + } >> >> #ifndef CONFIG_REPLICATION >> if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { >> @@ -1386,6 +1391,8 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) >> } >> >> if (params->has_block_incremental) { >> + warn_report("Block migration is deprecated. " >> + "Use blockdev-mirror with NBD instead."); > > Likewise. > >> s->parameters.block_incremental = params->block_incremental; >> } >> if (params->has_multifd_channels) { > > Other than that > Reviewed-by: Markus Armbruster <armbru@redhat.com> Thanks.
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 0149f040b6..5eaf096040 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -479,3 +479,13 @@ As an intermediate step the ``blk`` functionality can be achieved by setting the ``block`` migration capability to ``true``. But this capability is also deprecated. +block migration (since 8.2) +''''''''''''''''''''''''''' + +Block migration is too inflexible. It needs to migrate all block +devices or none. + +Please see "QMP invocation for live storage migration with +``blockdev-mirror`` + NBD" in docs/interop/live-block-operations.rst +for a detailed explanation. + diff --git a/qapi/migration.json b/qapi/migration.json index 59a07b50f0..c7633b22c0 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -269,11 +269,15 @@ # average memory load of the virtual CPU indirectly. Note that # zero means guest doesn't dirty memory. (Since 8.1) # +# Features: +# +# @deprecated: Member @disk is deprecated because block migration is. +# # Since: 0.14 ## { 'struct': 'MigrationInfo', 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationStats', - '*disk': 'MigrationStats', + '*disk': { 'type': 'MigrationStats', 'features': [ 'deprecated' ] }, '*vfio': 'VfioStats', '*xbzrle-cache': 'XBZRLECacheStats', '*total-time': 'int', @@ -525,6 +529,9 @@ # # Features: # +# @deprecated: Member @block is deprecated. Use blockdev-mirror with +# NBD instead. +# # @unstable: Members @x-colo and @x-ignore-shared are experimental. # # Since: 1.2 @@ -534,7 +541,8 @@ 'compress', 'events', 'postcopy-ram', { 'name': 'x-colo', 'features': [ 'unstable' ] }, 'release-ram', - 'block', 'return-path', 'pause-before-switchover', 'multifd', + { 'name': 'block', 'features': [ 'deprecated' ] }, + 'return-path', 'pause-before-switchover', 'multifd', 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate', { 'name': 'x-ignore-shared', 'features': [ 'unstable' ] }, 'validate-uuid', 'background-snapshot', @@ -835,6 +843,9 @@ # # Features: # +# @deprecated: Member @block-incremental is deprecated. Use +# blockdev-mirror with NBD instead. +# # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period # are experimental. # @@ -850,7 +861,7 @@ 'tls-creds', 'tls-hostname', 'tls-authz', 'max-bandwidth', 'avail-switchover-bandwidth', 'downtime-limit', { 'name': 'x-checkpoint-delay', 'features': [ 'unstable' ] }, - 'block-incremental', + { 'name': 'block-incremental', 'features': [ 'deprecated' ] }, 'multifd-channels', 'xbzrle-cache-size', 'max-postcopy-bandwidth', 'max-cpu-throttle', 'multifd-compression', @@ -1011,6 +1022,9 @@ # # Features: # +# @deprecated: Member @block-incremental is deprecated. Use +# blockdev-mirror with NBD instead. +# # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period # are experimental. # @@ -1040,7 +1054,8 @@ '*downtime-limit': 'uint64', '*x-checkpoint-delay': { 'type': 'uint32', 'features': [ 'unstable' ] }, - '*block-incremental': 'bool', + '*block-incremental': { 'type': 'bool', + 'features': [ 'deprecated' ] }, '*multifd-channels': 'uint8', '*xbzrle-cache-size': 'size', '*max-postcopy-bandwidth': 'size', @@ -1225,6 +1240,9 @@ # # Features: # +# @deprecated: Member @block-incremental is deprecated. Use +# blockdev-mirror with NBD instead. +# # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period # are experimental. # @@ -1251,7 +1269,8 @@ '*downtime-limit': 'uint64', '*x-checkpoint-delay': { 'type': 'uint32', 'features': [ 'unstable' ] }, - '*block-incremental': 'bool', + '*block-incremental': { 'type': 'bool', + 'features': [ 'deprecated' ] }, '*multifd-channels': 'uint8', '*xbzrle-cache-size': 'size', '*max-postcopy-bandwidth': 'size', diff --git a/migration/block.c b/migration/block.c index b60698d6e2..7682f4fbd2 100644 --- a/migration/block.c +++ b/migration/block.c @@ -731,6 +731,9 @@ static int block_save_setup(QEMUFile *f, void *opaque) trace_migration_block_save("setup", block_mig_state.submitted, block_mig_state.transferred); + warn_report("block migration is deprecated. Use blockdev-mirror with" + "NBD instead."); + ret = init_blk_migration(f); if (ret < 0) { return ret; diff --git a/migration/options.c b/migration/options.c index 42fb818956..0d0a3f8edb 100644 --- a/migration/options.c +++ b/migration/options.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "exec/target_page.h" #include "qapi/clone-visitor.h" #include "qapi/error.h" @@ -473,10 +474,14 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp) if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) " "block migration"); - error_append_hint(errp, "Use drive_mirror+NBD instead.\n"); + error_append_hint(errp, "Use blockdev-mirror with NBD instead.\n"); return false; } #endif + if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { + warn_report("Block migration is deprecated. " + "Use blockdev-mirror with NBD instead."); + } #ifndef CONFIG_REPLICATION if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { @@ -1386,6 +1391,8 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) } if (params->has_block_incremental) { + warn_report("Block migration is deprecated. " + "Use blockdev-mirror with NBD instead."); s->parameters.block_incremental = params->block_incremental; } if (params->has_multifd_channels) {