[PATCH 5/7] accel/tcg: Remove mentions of legacy '-machine foo, accel=bar'

[Philippe Mathieu-Daudé]

Since commit 6f6e1698a68 ("vl: configure accelerators from -accel
options") we prefer the '-accel bar' command line option.

Update the documentation when TCG is referred to.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 docs/about/removed-features.rst | 2 +-
 linux-user/s390x/target_proc.h  | 2 +-
 accel/tcg/monitor.c             | 4 ++--
 system/vl.c                     | 2 +-
 tests/qtest/qmp-cmd-test.c      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index ee6455aeeeb..d96dc5e80bc 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -216,7 +216,7 @@ The ``enforce-config-section`` property was replaced by the
 ``-no-kvm`` (removed in 5.2)
 ''''''''''''''''''''''''''''
 
-The ``-no-kvm`` argument was a synonym for setting ``-machine accel=tcg``.
+The ``-no-kvm`` argument was a synonym for setting ``-accel tcg``.
 
 ``-realtime`` (removed in 6.0)
 ''''''''''''''''''''''''''''''
diff --git a/linux-user/s390x/target_proc.h b/linux-user/s390x/target_proc.h
index a4a4821ea5c..f443d8f8080 100644
--- a/linux-user/s390x/target_proc.h
+++ b/linux-user/s390x/target_proc.h
@@ -7,7 +7,7 @@
 #define S390X_TARGET_PROC_H
 
 /*
- * Emulate what a Linux kernel running in qemu-system-s390x -M accel=tcg would
+ * Emulate what a Linux kernel running in 'qemu-system-s390x -accel tcg' would
  * show in /proc/cpuinfo.
  *
  * Skip the following in order to match the missing support in op_ecag():
diff --git a/accel/tcg/monitor.c b/accel/tcg/monitor.c
index 093efe97144..0430b6e1514 100644
--- a/accel/tcg/monitor.c
+++ b/accel/tcg/monitor.c
@@ -204,7 +204,7 @@ HumanReadableText *qmp_x_query_jit(Error **errp)
     g_autoptr(GString) buf = g_string_new("");
 
     if (!tcg_enabled()) {
-        error_setg(errp, "JIT information is only available with accel=tcg");
+        error_setg(errp, "JIT information is only available with TCG");
         return NULL;
     }
 
@@ -226,7 +226,7 @@ HumanReadableText *qmp_x_query_opcount(Error **errp)
 
     if (!tcg_enabled()) {
         error_setg(errp,
-                   "Opcode count information is only available with 
accel=tcg");
+                   "Opcode count information is only available with TCG");
         return NULL;
     }
 
diff --git a/system/vl.c b/system/vl.c
index 54998fdbc7e..c056fcb740c 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2385,7 +2385,7 @@ static void configure_accelerators(const char *progname)
         for (tmp = accel_list; *tmp; tmp++) {
             /*
              * Filter invalid accelerators here, to prevent obscenities
-             * such as "-machine accel=tcg,,thread=single".
+             * such as "-accel tcg,,thread=single".
              */
             if (accel_find(*tmp)) {
                 qemu_opts_parse_noisily(qemu_find_opts("accel"), *tmp, true);
diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
index 2c15f609584..83f4a2b451b 100644
--- a/tests/qtest/qmp-cmd-test.c
+++ b/tests/qtest/qmp-cmd-test.c
@@ -49,7 +49,7 @@ static int query_error_class(const char *cmd)
         { "query-vm-generation-id", ERROR_CLASS_GENERIC_ERROR },
         /* Only valid with a USB bus added */
         { "x-query-usb", ERROR_CLASS_GENERIC_ERROR },
-        /* Only valid with accel=tcg */
+        /* Only valid with TCG */
         { "x-query-jit", ERROR_CLASS_GENERIC_ERROR },
         { "x-query-opcount", ERROR_CLASS_GENERIC_ERROR },
         { "xen-event-list", ERROR_CLASS_GENERIC_ERROR },
-- 
2.45.2