Deprecated in commit c2fb6eaeb9d4 (qapi/migration: Deprecate migrate argument @detach), v10.1.0. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- docs/about/deprecated.rst | 5 ----- docs/about/removed-features.rst | 5 +++++ qapi/migration.json | 8 -------- migration/migration-hmp-cmds.c | 2 +- migration/migration.c | 2 +- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e9b019b41c..b53d885533 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -142,11 +142,6 @@ Use ``job-dismiss`` instead. Use ``job-finalize`` instead. -``migrate`` argument ``detach`` (since 10.1) -'''''''''''''''''''''''''''''''''''''''''''' - -This argument has always been ignored. - Human Machine Protocol (HMP) commands ------------------------------------- diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 9e5a4dcbac..5eee371f5f 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -760,6 +760,11 @@ without reporting any destination threads, or non-multifd source threads). For debugging purpose, please use ``-name $VM,debug-threads=on`` instead. +``migrate`` argument ``detach`` (since 11.0) +'''''''''''''''''''''''''''''''''''''''''''' + +This argument has always been ignored. + QEMU Machine Protocol (QMP) events ---------------------------------- diff --git a/qapi/migration.json b/qapi/migration.json index 7bd24e66e9..c99ae433e0 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1397,19 +1397,12 @@ # @channels: list of migration stream channels with each stream in the # list connected to a destination interface endpoint. # -# @detach: this argument exists only for compatibility reasons and is -# ignored by QEMU -# # @resume: when set, use the new uri/channels specified to resume # paused postcopy migration. This flag should only be used if # the previous postcopy migration was interrupted. The command # will fail unless migration is in "postcopy-paused" state. # (default: false, since 3.0) # -# Features: -# -# @deprecated: Argument @detach is deprecated. -# # Since: 0.14 # # .. admonition:: Notes @@ -1469,7 +1462,6 @@ { 'command': 'migrate', 'data': {'*uri': 'str', '*channels': [ 'MigrationChannel' ], - '*detach': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*resume': 'bool' } } ## diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index a2863e6a2f..0a193b8f54 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -829,7 +829,7 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) } QAPI_LIST_PREPEND(caps, g_steal_pointer(&channel)); - qmp_migrate(NULL, true, caps, false, false, true, resume, &err); + qmp_migrate(NULL, true, caps, true, resume, &err); if (hmp_handle_error(mon, err)) { return; } diff --git a/migration/migration.c b/migration/migration.c index 94ade36574..42eaceb38a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2203,7 +2203,7 @@ static gboolean qmp_migrate_finish_cb(QIOChannel *channel, } void qmp_migrate(const char *uri, bool has_channels, - MigrationChannelList *channels, bool has_detach, bool detach, + MigrationChannelList *channels, bool has_resume, bool resume, Error **errp) { bool resume_requested; -- 2.52.0