diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-10-18 13:55:11 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-31 08:44:33 +0100 |
| commit | 8846b5bfca761d599974482c21fa6da3d3c13a70 (patch) | |
| tree | 80922a10291b4f2da24f6fcf2196eb36cfe4e87a | |
| parent | 40101f320d6bf504663327cd12e99f36555a1f56 (diff) | |
| download | qemu-8846b5bfca761d599974482c21fa6da3d3c13a70.zip qemu-8846b5bfca761d599974482c21fa6da3d3c13a70.tar.gz qemu-8846b5bfca761d599974482c21fa6da3d3c13a70.tar.bz2 | |
migration: migrate 'blk' command option is deprecated.
Use blocked-mirror with NBD instead.
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231018115513.2163-4-quintela@redhat.com>
| -rw-r--r-- | docs/about/deprecated.rst | 9 | ||||
| -rw-r--r-- | migration/migration-hmp-cmds.c | 5 | ||||
| -rw-r--r-- | migration/migration.c | 5 | ||||
| -rw-r--r-- | qapi/migration.json | 7 |
4 files changed, 23 insertions, 3 deletions
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1c8c8c3..c161346 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -477,3 +477,12 @@ Use blockdev-mirror with NBD instead. As an intermediate step the ``inc`` functionality can be achieved by setting the ``block-incremental`` migration parameter to ``true``. But this parameter is also deprecated. + +``blk`` migrate command option (since 8.2) +'''''''''''''''''''''''''''''''''''''''''' + +Use blockdev-mirror with NBD instead. + +As an intermediate step the ``blk`` functionality can be achieved by +setting the ``block`` migration capability to ``true``. But this +capability is also deprecated. diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index 83176f5..dfe98da 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -750,6 +750,11 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) " use blockdev-mirror with NBD instead"); } + if (blk) { + warn_report("option '-b' is deprecated;" + " use blockdev-mirror with NBD instead"); + } + qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, true, resume, &err); if (hmp_handle_error(mon, err)) { diff --git a/migration/migration.c b/migration/migration.c index 06a706a..cb2d716 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1625,6 +1625,11 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, " use blockdev-mirror with NBD instead"); } + if (blk) { + warn_report("parameter 'blk' is deprecated;" + " use blockdev-mirror with NBD instead"); + } + if (resume) { if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) { error_setg(errp, "Cannot resume if there is no " diff --git a/qapi/migration.json b/qapi/migration.json index fa7f4f2..3765c2b 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1526,8 +1526,8 @@ # # Features: # -# @deprecated: Member @inc is deprecated. Use blockdev-mirror with -# NBD instead. +# @deprecated: Members @inc and @blk are deprecated. Use +# blockdev-mirror with NBD instead. # # Returns: nothing on success # @@ -1550,7 +1550,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' } } |