migration: Drop deprecated QMP migrate argument @detach

Deprecated in commit c2fb6eaeb9d4 (qapi/migration: Deprecate migrate
argument @detach), v10.1.0.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/qemu-devel/20260108125512.2234147-3-armbru@redhat.com
Signed-off-by: Fabiano Rosas <farosas@suse.de>

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index f57422d378e5e8aac3091b5dceab8414405aa910..4595cc2db57bd847196dd9d0c4fce44cd230264b 100644 (file)
--- 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 4e0775dbc097c6f1ac82863532a424c3a4d4eae2..ebdfb696edcc10033460cdc09384b5569555827a 100644 (file)
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -766,6 +766,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/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index a2863e6a2f6f80ee2339894dbddb1e657d4234e8..0a193b8f54a3d509cb9791d5fb6fa226369cd81c 100644 (file)
--- 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 9c6aa6f98ac1c5f51b24cda14cfbefa854c95e4c..4062c12d33c2e143585d2115761bd9024893c03a 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2201,7 +2201,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;

diff --git a/qapi/migration.json b/qapi/migration.json
index 7bd24e66e91d4f52b99d661fb2bed5add008a370..c99ae433e00aaa1d5d64522945c413d24fc633ec 100644 (file)
--- 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' } }
 
 ##