[PULL 51/59] system: Remove deprecated 'debug-threads' option for -name

["Philippe Mathieu-Daudé" <philmd@oss.qualcomm.com>]

'debug-threads' option for -name was deprecated in v11.0
(commit 1b65aeed2a0 "system: unconditionally enable thread
naming") thus can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
Message-Id: <20261018232917.7716-1-philmd@oss.qualcomm.com>
---
 docs/about/deprecated.rst             |  7 -------
 docs/about/removed-features.rst       |  9 +++++++--
 system/vl.c                           | 11 -----------
 tests/qtest/migration/framework.c     |  4 ++--
 tests/qtest/migration/precopy-tests.c |  2 +-
 qemu-options.hx                       |  7 +++----
 6 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 153fe118151c..ffcbe624a4e9 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -54,13 +54,6 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``.
 However, short-form booleans are deprecated and full explicit ``arg_name=on``
 form is preferred.
 
-``debug-threads`` option for ``-name`` (since 11.0)
-'''''''''''''''''''''''''''''''''''''''''''''''''''
-
-The ``debug-threads`` option of the ``-name`` argument is now
-ignored. Thread naming is unconditionally enabled for all platforms
-where it is supported.
-
 ``-mon`` option (since 11.1)
 ''''''''''''''''''''''''''''
 
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index 6a9944a0c794..cd4f3338bccf 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -578,6 +578,11 @@ kernel since 2001. None of the board types QEMU supports need
 Keeping 32-bit host support alive was a substantial burden for the
 QEMU project.  Thus QEMU dropped all support for all 32-bit host systems.
 
+``debug-threads`` option for ``-name`` (removed in 11.2)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Thread naming is unconditionally enabled for all platforms where it
+is supported.
 
 User-mode emulator command line arguments
 -----------------------------------------
@@ -779,8 +784,8 @@ values could be assigned to integer device properties or vice versa.
 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.
+threads).  For debugging purpose, thread names are unconditionally
+enabled where supported.
 
 ``migrate`` argument ``detach`` (removed in 11.0)
 ''''''''''''''''''''''''''''''''''''''''''''''''''
diff --git a/system/vl.c b/system/vl.c
index 468a9fc247ac..e766402f7e19 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -403,11 +403,6 @@ static QemuOptsList qemu_name_opts = {
             .name = "process",
             .type = QEMU_OPT_STRING,
             .help = "Sets the name of the QEMU process, as shown in top etc",
-        }, {
-            .name = "debug-threads",
-            .type = QEMU_OPT_BOOL,
-            .help = "Enable thread names"
-                    "(deprecated, always enabled where supported)",
         },
         { /* End of list */ }
     },
@@ -556,12 +551,6 @@ static int parse_name(void *opaque, QemuOpts *opts, Error **errp)
 {
     const char *proc_name;
 
-    if (qemu_opt_get(opts, "debug-threads") &&
-        !qemu_opt_get_bool(opts, "debug-threads", false)) {
-        fprintf(stderr, "Ignoring deprecated 'debug-threads=no' option, " \
-                "thread naming is unconditionally enabled\n");
-    }
-
     qemu_name = qemu_opt_get(opts, "guest");
 
     proc_name = qemu_opt_get(opts, "process");
diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c
index b7aef6b21cbb..fbe1e1f247d6 100644
--- a/tests/qtest/migration/framework.c
+++ b/tests/qtest/migration/framework.c
@@ -413,7 +413,7 @@ int migrate_args(char **from, char **to, MigrateStart *args)
 
     cmd_source = g_strdup_printf("-accel kvm%s -accel tcg "
                                  "-machine %s,%s "
-                                 "-name source,debug-threads=on "
+                                 "-name source "
                                  "%s "
                                  "-serial file:%s/src_serial "
                                  "%s %s %s",
@@ -433,7 +433,7 @@ int migrate_args(char **from, char **to, MigrateStart *args)
 
     cmd_target = g_strdup_printf("-accel kvm%s -accel tcg "
                                  "-machine %s,%s "
-                                 "-name target,debug-threads=on "
+                                 "-name target "
                                  "%s "
                                  "-serial file:%s/dest_serial "
                                  "-incoming defer "
diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c
index d57ffcac234d..3298bf026a1a 100644
--- a/tests/qtest/migration/precopy-tests.c
+++ b/tests/qtest/migration/precopy-tests.c
@@ -807,7 +807,7 @@ static QTestState *dirtylimit_start_vm(void)
 
     bootpath = bootfile_create(qtest_get_arch(), tmpfs, false);
     cmd = g_strdup_printf("-accel kvm,dirty-ring-size=4096 "
-                          "-name dirtylimit-test,debug-threads=on "
+                          "-name dirtylimit-test "
                           "-m 150M -smp 1 "
                           "-serial file:%s/vm_serial "
                           "-drive file=%s,format=raw ",
diff --git a/qemu-options.hx b/qemu-options.hx
index f72f30e246d6..c9653ca69daf 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1376,18 +1376,17 @@ SRST
 ERST
 
 DEF("name", HAS_ARG, QEMU_OPTION_name,
-    "-name string1[,process=string2][,debug-threads=on|off]\n"
+    "-name string1[,process=string2]\n"
     "                set the name of the guest\n"
     "                string1 sets the window title and string2 the process name\n"
-    "                When debug-threads is enabled, individual threads are given a separate name\n"
     "                NOTE: The thread names are for debugging and not a stable API.\n",
     QEMU_ARCH_ALL)
 SRST
 ``-name name``
     Sets the name of the guest. This name will be displayed in the SDL
     window caption. The name will also be used for the VNC server. Also
-    optionally set the top visible process name in Linux. Naming of
-    individual threads can also be enabled on Linux to aid debugging.
+    where supported, set the top visible process name (individual threads
+    are always given a separate name to aid debugging).
 ERST
 
 DEF("uuid", HAS_ARG, QEMU_OPTION_uuid,
-- 
2.55.0