migration: Drop deprecated QMP stuff
cover migration: Drop deprecated QMP stuff
Markus Armbruster (2):
migration: Drop deprecated QMP command query-migrationthreads
migration: Drop deprecated QMP migrate argument @detach
docs/about/deprecated.rst | 13 ------- docs/about/removed-features.rst | 14 ++++++++ qapi/migration.json | 38 -------------------- migration/threadinfo.h | 25 ------------- migration/migration-hmp-cmds.c | 2 +- migration/migration.c | 8 +---- migration/multifd.c | 5 --- migration/threadinfo.c | 64 --------------------------------- migration/meson.build | 1 - 9 files changed, 16 insertions(+), 154 deletions(-) delete mode 100644 migration/threadinfo.h delete mode 100644 migration/threadinfo.c
Signature · 1 line
2.52.0
PATCH 1/2 migration: Drop deprecated QMP command query-migrationthreads
Deprecated in commit 228529d1fec3 (migration: Deprecate query-migrationthreads command), v9.2.0.
Signed-off-by Markus Armbruster <[email protected]>
--- docs/about/deprecated.rst | 8 ----- docs/about/removed-features.rst | 9 +++++ qapi/migration.json | 30 ---------------- migration/threadinfo.h | 25 ------------- migration/migration.c | 6 ---- migration/multifd.c | 5 --- migration/threadinfo.c | 64 --------------------------------- migration/meson.build | 1 - 8 files changed, 9 insertions(+), 139 deletions(-) delete mode 100644 migration/threadinfo.h delete mode 100644 migration/threadinfo.c
docs/about/deprecated.rst +0 -8
@@ -111,14 +111,6 @@ options are removed in favor of using explicit ``blockdev-create`` and ``blockdev-add`` calls. See :doc:`/interop/live-block-operations` for details. -``query-migrationthreads`` (since 9.2) -'''''''''''''''''''''''''''''''''''''' - -To be removed with no replacement, as it reports only a limited set of -threads (for example, it only reports source side of multifd threads, -without reporting any destination threads, or non-multifd source threads). -For debugging purpose, please use ``-name $VM,debug-threads=on`` instead. - ``block-job-pause`` (since 10.1) ''''''''''''''''''''''''''''''''
docs/about/removed-features.rst +9 -0
@@ -751,6 +751,15 @@ or list arguments were silently ignored. Other argument types were not checked, but an implicit conversion happened, so that e.g. string values could be assigned to integer device properties or vice versa. +``query-migrationthreads`` (removed in 11.0) +'''''''''''''''''''''''''''''''''''''' + +Removed with no replacement, as it reported only a limited set of +threads (for example, it only reported source side of multifd threads, +without reporting any destination threads, or non-multifd source +threads). For debugging purpose, please use ``-name +$VM,debug-threads=on`` instead. + QEMU Machine Protocol (QMP) events ----------------------------------
qapi/migration.json +0 -30
@@ -2054,36 +2054,6 @@ { 'command': 'query-vcpu-dirty-limit', 'returns': [ 'DirtyLimitInfo' ] } -## -# @MigrationThreadInfo: -# -# Information about migrationthreads -# -# @name: the name of migration thread -# -# @thread-id: ID of the underlying host thread -# -# Since: 7.2 -## -{ 'struct': 'MigrationThreadInfo', - 'data': {'name': 'str', - 'thread-id': 'int'} } - -## -# @query-migrationthreads: -# -# Return information of migration threads -# -# Features: -# -# @deprecated: This command is deprecated with no replacement yet. -# -# Since: 7.2 -## -{ 'command': 'query-migrationthreads', - 'returns': ['MigrationThreadInfo'], - 'features': ['deprecated'] } - ## # @snapshot-save: #
migration/threadinfo.h deleted +0 -25
@@ -1,25 +0,0 @@ -/* -* Migration Threads info -* -* Copyright (c) 2022 HUAWEI TECHNOLOGIES CO., LTD. -* -* Authors: -* Jiang Jiacheng <[email protected]> -* -* This work is licensed under the terms of the GNU GPL, version 2 or later. -* See the COPYING file in the top-level directory. -*/ - -#include "qapi/error.h" -#include "qapi/qapi-commands-migration.h" - -typedef struct MigrationThread MigrationThread ; - -struct MigrationThread { -const char *name;/* the name of migration thread */ -int thread_id;/* ID of the underlying host thread */ -QLIST_ENTRY (MigrationThread) node; -}; - -MigrationThread *migration_threads_add (const char *name,int thread_id); -void migration_threads_remove (MigrationThread *info);
migration/migration.c +0 -6
@@ -59,7 +59,6 @@#include "net/announce.h" #include "qemu/queue.h" #include "multifd.h" -#include "threadinfo.h" #include "qemu/yank.h" #include "system/cpus.h" #include "yank_functions.h"
@@ -3746,16 +3745,12 @@ static void qemu_savevm_wait_unplug(MigrationState *s, int old_state,static void *migration_thread (void *opaque) {MigrationState *s = opaque; -MigrationThread *thread =NULL ;int64_t setup_start =qemu_clock_get_ms (QEMU_CLOCK_HOST );MigThrError thr_error;bool urgent = false;Error *local_err =NULL ;int ret; - thread =migration_threads_add (MIGRATION_THREAD_SRC_MAIN , -qemu_get_thread_id ()); -rcu_register_thread ();update_iteration_initial_status (s);
@@ -3856,7 +3851,6 @@ out:migration_iteration_finish (s);object_unref (OBJECT (s));rcu_unregister_thread (); -migration_threads_remove (thread);return NULL ; }
migration/multifd.c +0 -5
@@ -29,7 +29,6 @@#include "qemu-file.h" #include "trace.h" #include "multifd.h" -#include "threadinfo.h" #include "options.h" #include "qemu/yank.h" #include "io/channel-file.h"
@@ -662,13 +661,10 @@ int multifd_send_sync_main(MultiFDSyncReq req)static void *multifd_send_thread (void *opaque) {MultiFDSendParams *p = opaque; -MigrationThread *thread =NULL ;Error *local_err =NULL ;int ret =0 ;bool use_packets =multifd_use_packets (); - thread =migration_threads_add (p->name,qemu_get_thread_id ()); -trace_multifd_send_thread_start (p->id);rcu_register_thread ();
@@ -783,7 +779,6 @@ out: }rcu_unregister_thread (); -migration_threads_remove (thread);trace_multifd_send_thread_end (p->id, p->packets_sent);return NULL ;
migration/threadinfo.c deleted +0 -64
64 lines not on this page · raw message
migration/meson.build +0 -1
@@ -36,7 +36,6 @@ system_ss.add(files( 'savevm.c', 'socket.c', 'tls.c', - 'threadinfo.c', ), gnutls, zlib) if get_option('replication').allowed()
Signature · 1 line
2.52.0
PATCH 2/2 migration: Drop deprecated QMP migrate argument @detach
In reply to Markus ArmbrusterDeprecated in commit c2fb6eaeb9d4 (qapi/migration: Deprecate migrate argument @detach), v10.1.0.
Signed-off-by Markus Armbruster <[email protected]>
--- 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(-)
docs/about/deprecated.rst +0 -5
@@ -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 -------------------------------------
docs/about/removed-features.rst +5 -0
@@ -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 ----------------------------------
qapi/migration.json +0 -8
@@ -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' } } ##
migration/migration-hmp-cmds.c +1 -1
@@ -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 ; }
migration/migration.c +1 -1
@@ -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;
Signature · 1 line
2.52.0
Quoted 4 lines · Markus Armbruster
Markus Armbruster (2):
migration: Drop deprecated QMP command query-migrationthreads
migration: Drop deprecated QMP migrate argument @detach
Quoted 12 lines
docs/about/deprecated.rst | 13 ------- docs/about/removed-features.rst | 14 ++++++++ qapi/migration.json | 38 -------------------- migration/threadinfo.h | 25 ------------- migration/migration-hmp-cmds.c | 2 +- migration/migration.c | 8 +---- migration/multifd.c | 5 --- migration/threadinfo.c | 64 --------------------------------- migration/meson.build | 1 - 9 files changed, 16 insertions(+), 154 deletions(-) delete mode 100644 migration/threadinfo.h delete mode 100644 migration/threadinfo.c
Reviewed-by Fabiano Rosas <[email protected]>
Queued, thanks!