From nobody Mon Feb 2 07:25:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767876960; cv=none; d=zohomail.com; s=zohoarc; b=H6DC+Oyien690ShJIkLxoXAak7TutkdSZVUbs7DatqkrRtYMpz+NNtKlWpodmtpFOgsLPFJMBXIdghb2+ITDjjWWo/ZvhqHv6sU+U7QMmpH7Gh09yRXBWk5dDyD55O7497OYHITUbjtaNWxJMg/5L3kDhTWKYs70F+ICm1VVQhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767876960; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LbyNt96iOeo5MCGW1ot6kEtB7evQ7Ysg+18NbyH35aQ=; b=Po5vobGN+4GzdR4s9r2jq7RCl1fPHltrs/9qNswIFZFdQF8uiGyPn3lzfc69Bma1BKRSGwoSgFVz/nVZJgXaRS+A/3XC82w3wRSDQIcMQ8OTSjohzg8GOVhcJNpkuY3QjGgbwkjNrk1p20ApFjnRARnIZmQhxQyqp0AcAK9AK10= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767876960114833.1366936557436; Thu, 8 Jan 2026 04:56:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdpY2-0001us-Fg; Thu, 08 Jan 2026 07:55:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdpXw-0001ty-CH for qemu-devel@nongnu.org; Thu, 08 Jan 2026 07:55:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdpXt-0005Kw-PN for qemu-devel@nongnu.org; Thu, 08 Jan 2026 07:55:24 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-668-JP5wMj5GOimk-fJkVm8OLw-1; Thu, 08 Jan 2026 07:55:17 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EE21F1956096; Thu, 8 Jan 2026 12:55:15 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A03618008FF; Thu, 8 Jan 2026 12:55:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DB4A621E61A9; Thu, 08 Jan 2026 13:55:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767876920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LbyNt96iOeo5MCGW1ot6kEtB7evQ7Ysg+18NbyH35aQ=; b=AzQYqupONQjmzkw/OmvK/JGaqDeWc1CvrYpl0lgo3SqjHi/jY9w7zAs/SjcEePP7hO04Zu b8syTzgvDpju7zgQ/TM7EC9Vm5A05ruD5WPsZ9mXCjXO7m0fKM/hUdlzVNgJnApx5WyXp7 STKPNqyuyojx78I9n3tiSr5I6/MfJDU= X-MC-Unique: JP5wMj5GOimk-fJkVm8OLw-1 X-Mimecast-MFC-AGG-ID: JP5wMj5GOimk-fJkVm8OLw_1767876916 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peterx@redhat.com, farosas@suse.de, devel@lists.libvirt.org, eblake@redhat.com Subject: [PATCH 1/2] migration: Drop deprecated QMP command query-migrationthreads Date: Thu, 8 Jan 2026 13:55:11 +0100 Message-ID: <20260108125512.2234147-2-armbru@redhat.com> In-Reply-To: <20260108125512.2234147-1-armbru@redhat.com> References: <20260108125512.2234147-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767876961929158500 Content-Type: text/plain; charset="utf-8" Deprecated in commit 228529d1fec3 (migration: Deprecate query-migrationthreads command), v9.2.0. Signed-off-by: Markus Armbruster Reviewed-by: Fabiano Rosas --- 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 diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7abb3dab59..e9b019b41c 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -111,14 +111,6 @@ options are removed in favor of using explicit ``block= dev-create`` and ``blockdev-add`` calls. See :doc:`/interop/live-block-operations` for details. =20 -``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=3Don`` instead. - ``block-job-pause`` (since 10.1) '''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index e81d79da47..9e5a4dcbac 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -751,6 +751,15 @@ or list arguments were silently ignored. Other argumen= t 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. =20 +``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=3Don`` instead. + QEMU Machine Protocol (QMP) events ---------------------------------- =20 diff --git a/qapi/migration.json b/qapi/migration.json index 201dedd982..7bd24e66e9 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -2054,36 +2054,6 @@ { 'command': 'query-vcpu-dirty-limit', 'returns': [ 'DirtyLimitInfo' ] } =20 -## -# @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: # diff --git a/migration/threadinfo.h b/migration/threadinfo.h deleted file mode 100644 index 2f356ff312..0000000000 --- a/migration/threadinfo.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Migration Threads info - * - * Copyright (c) 2022 HUAWEI TECHNOLOGIES CO., LTD. - * - * Authors: - * Jiang Jiacheng - * - * This work is licensed under the terms of the GNU GPL, version 2 or lat= er. - * 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); diff --git a/migration/migration.c b/migration/migration.c index 9d1bf5d276..94ade36574 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -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 =3D opaque; - MigrationThread *thread =3D NULL; int64_t setup_start =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); MigThrError thr_error; bool urgent =3D false; Error *local_err =3D NULL; int ret; =20 - thread =3D migration_threads_add(MIGRATION_THREAD_SRC_MAIN, - qemu_get_thread_id()); - rcu_register_thread(); =20 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; } =20 diff --git a/migration/multifd.c b/migration/multifd.c index bf6da85af8..8d8f23b4b9 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -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 =3D opaque; - MigrationThread *thread =3D NULL; Error *local_err =3D NULL; int ret =3D 0; bool use_packets =3D multifd_use_packets(); =20 - thread =3D migration_threads_add(p->name, qemu_get_thread_id()); - trace_multifd_send_thread_start(p->id); rcu_register_thread(); =20 @@ -783,7 +779,6 @@ out: } =20 rcu_unregister_thread(); - migration_threads_remove(thread); trace_multifd_send_thread_end(p->id, p->packets_sent); =20 return NULL; diff --git a/migration/threadinfo.c b/migration/threadinfo.c deleted file mode 100644 index 262990dd75..0000000000 --- a/migration/threadinfo.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Migration Threads info - * - * Copyright (c) 2022 HUAWEI TECHNOLOGIES CO., LTD. - * - * Authors: - * Jiang Jiacheng - * - * This work is licensed under the terms of the GNU GPL, version 2 or lat= er. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "qemu/queue.h" -#include "qemu/lockable.h" -#include "threadinfo.h" - -QemuMutex migration_threads_lock; -static QLIST_HEAD(, MigrationThread) migration_threads; - -static void __attribute__((constructor)) migration_threads_init(void) -{ - qemu_mutex_init(&migration_threads_lock); -} - -MigrationThread *migration_threads_add(const char *name, int thread_id) -{ - MigrationThread *thread =3D g_new0(MigrationThread, 1); - thread->name =3D name; - thread->thread_id =3D thread_id; - - WITH_QEMU_LOCK_GUARD(&migration_threads_lock) { - QLIST_INSERT_HEAD(&migration_threads, thread, node); - } - - return thread; -} - -void migration_threads_remove(MigrationThread *thread) -{ - QEMU_LOCK_GUARD(&migration_threads_lock); - if (thread) { - QLIST_REMOVE(thread, node); - g_free(thread); - } -} - -MigrationThreadInfoList *qmp_query_migrationthreads(Error **errp) -{ - MigrationThreadInfoList *head =3D NULL; - MigrationThreadInfoList **tail =3D &head; - MigrationThread *thread =3D NULL; - - QEMU_LOCK_GUARD(&migration_threads_lock); - QLIST_FOREACH(thread, &migration_threads, node) { - MigrationThreadInfo *info =3D g_new0(MigrationThreadInfo, 1); - info->name =3D g_strdup(thread->name); - info->thread_id =3D thread->thread_id; - - QAPI_LIST_APPEND(tail, info); - } - - return head; -} diff --git a/migration/meson.build b/migration/meson.build index 16909d54c5..c7f39bdb55 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -36,7 +36,6 @@ system_ss.add(files( 'savevm.c', 'socket.c', 'tls.c', - 'threadinfo.c', ), gnutls, zlib) =20 if get_option('replication').allowed() --=20 2.52.0 From nobody Mon Feb 2 07:25:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767876960; cv=none; d=zohomail.com; s=zohoarc; b=TC3Dz9VcxsTL+0v24Anhs3YnXkWRjM+WViGjKsvGnaAP2OW//KV33QQYfyDm5By0R4dQTccrowEOcJAe14GxDjYCbeA1T5YOsnTggcSFQWwlAcv6slUIf7JAG1Bp3hME2F/DegZwQcB8QbzG3wHNWjGHftHHV75LuAsKVJ6Ltd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767876960; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eOHTmsngTX/h/fzMLmGrM+0LJo6gOgPawHYtAV0OeaE=; b=dQ5dROMXaFHtySWd38wJdsWn+uwpcWmzSD8TqUUiW7wZUGWpCKVXljWzMcfCQNMvPHi42upuNEugAmHBuPQkqUb7g9DdceYzixGWeZ3VNcuJeDSPJm9kzbJaJ/oaQCOGOQKuaTPklTnuIbXHDSkUvGp+DaaC5qVUSccZYG6c2t0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767876960684670.0433085094816; Thu, 8 Jan 2026 04:56:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdpY2-0001uy-HJ; Thu, 08 Jan 2026 07:55:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdpXx-0001uG-3l for qemu-devel@nongnu.org; Thu, 08 Jan 2026 07:55:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdpXu-0005LG-5L for qemu-devel@nongnu.org; Thu, 08 Jan 2026 07:55:24 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-128-Syf0byNeNeqju8TuVy7-mQ-1; Thu, 08 Jan 2026 07:55:17 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C16821956050; Thu, 8 Jan 2026 12:55:15 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E78519560A2; Thu, 8 Jan 2026 12:55:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DFB3521E61AA; Thu, 08 Jan 2026 13:55:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767876921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eOHTmsngTX/h/fzMLmGrM+0LJo6gOgPawHYtAV0OeaE=; b=i1sxo8MlhP9jmv+Mfl/6/4po69TdWhwT4cggn7n1dgYdkHV0FhnBwHZ0NGVc/lxmq0V4Jd AvOBR6+PdMMcbxrq92NgrgC9XY+1mWwiBbCSeqL1YepYE94f+Ng/18lnEeuY4zdWFUyzCC AoV/Pe3V68xeK2tiT1OhnWYK/BisNaw= X-MC-Unique: Syf0byNeNeqju8TuVy7-mQ-1 X-Mimecast-MFC-AGG-ID: Syf0byNeNeqju8TuVy7-mQ_1767876916 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peterx@redhat.com, farosas@suse.de, devel@lists.libvirt.org, eblake@redhat.com Subject: [PATCH 2/2] migration: Drop deprecated QMP migrate argument @detach Date: Thu, 8 Jan 2026 13:55:12 +0100 Message-ID: <20260108125512.2234147-3-armbru@redhat.com> In-Reply-To: <20260108125512.2234147-1-armbru@redhat.com> References: <20260108125512.2234147-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767876961865158500 Content-Type: text/plain; charset="utf-8" Deprecated in commit c2fb6eaeb9d4 (qapi/migration: Deprecate migrate argument @detach), v10.1.0. Signed-off-by: Markus Armbruster Reviewed-by: Fabiano Rosas --- 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. =20 Use ``job-finalize`` instead. =20 -``migrate`` argument ``detach`` (since 10.1) -'''''''''''''''''''''''''''''''''''''''''''' - -This argument has always been ignored. - Human Machine Protocol (HMP) commands ------------------------------------- =20 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-mult= ifd source threads). For debugging purpose, please use ``-name $VM,debug-threads=3Don`` instead. =20 +``migrate`` argument ``detach`` (since 11.0) +'''''''''''''''''''''''''''''''''''''''''''' + +This argument has always been ignored. + QEMU Machine Protocol (QMP) events ---------------------------------- =20 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' } } =20 ## 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)); =20 - 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 *cha= nnel, } =20 void qmp_migrate(const char *uri, bool has_channels, - MigrationChannelList *channels, bool has_detach, bool det= ach, + MigrationChannelList *channels, bool has_resume, bool resume, Error **errp) { bool resume_requested; --=20 2.52.0