mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: migrate 'blk' command option is deprecated.

Browse Source 
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>
This commit is contained in:
Juan Quintela 2023-10-18 13:55:11 +02:00
parent 40101f320d
commit 8846b5bfca
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/about/deprecated.rst
View File

@ -477,3 +477,12 @@ Use blockdev-mirror with NBD instead.
As an intermediate step the ``inc`` functionality can be achieved by As an intermediate step the ``inc`` functionality can be achieved by
setting the ``block-incremental`` migration parameter to ``true``. setting the ``block-incremental`` migration parameter to ``true``.
But this parameter is also deprecated. 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.

5
migration/migration-hmp-cmds.c
View File

@ -750,6 +750,11 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
" use blockdev-mirror with NBD instead"); " 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, qmp_migrate(uri, !!blk, blk, !!inc, inc,
false, false, true, resume, &err); false, false, true, resume, &err);
if (hmp_handle_error(mon, err)) { if (hmp_handle_error(mon, err)) {

5
migration/migration.c
View File

@ -1625,6 +1625,11 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
" use blockdev-mirror with NBD instead"); " use blockdev-mirror with NBD instead");
} }
if (blk) {
warn_report("parameter 'blk' is deprecated;"
" use blockdev-mirror with NBD instead");
}
if (resume) { if (resume) {
if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) { if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
error_setg(errp, "Cannot resume if there is no " error_setg(errp, "Cannot resume if there is no "

7
qapi/migration.json
View File

@ -1526,8 +1526,8 @@
# #
# Features: # Features:
# #
# @deprecated: Member @inc is deprecated. Use blockdev-mirror with # @deprecated: Members @inc and @blk are deprecated. Use
# NBD instead. # blockdev-mirror with NBD instead.
# #
# Returns: nothing on success # Returns: nothing on success
# #
@ -1550,7 +1550,8 @@
# <- { "return": {} } # <- { "return": {} }
## ##
{ 'command': 'migrate', { 'command': 'migrate',
'data': {'uri': 'str', '*blk': 'bool', 'data': {'uri': 'str',
'*blk': { 'type': 'bool', 'features': [ 'deprecated' ] },
'*inc': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*inc': { 'type': 'bool', 'features': [ 'deprecated' ] },
'*detach': 'bool', '*resume': 'bool' } } '*detach': 'bool', '*resume': 'bool' } }