[PATCH 1/4] accel/tcg: Remove deprecated '-tb-size' option

From: Philippe Mathieu-Daudé <philmd(a)redhat.com&gt; The '-tb-size' option (replaced by '-accel tcg,tb-size') is deprecated since 5.0 (commit fe174132478). Remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com&gt; Message-Id: <20201202112714.1223783-1-philmd(a)redhat.com&gt; Signed-off-by: Thomas Huth <thuth(a)redhat.com&gt; --- accel/tcg/translate-all.c | 2 +- docs/system/deprecated.rst | 12 +++++------- qemu-options.hx | 8 -------- softmmu/vl.c | 8 -------- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 4572b4901f..b7d50a73d4 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2379,7 +2379,7 @@ void dump_exec_info(void) qemu_printf("Translation buffer state:\n"); /* * Report total code size including the padding and TB structs; - * otherwise users might think "-tb-size" is not honoured. + * otherwise users might think "-accel tcg,tb-size" is not honoured. * For avg host size we use the precise numbers from tb_tree_stats though. */ qemu_printf("gen code size %zu/%zu\n", diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 565389697e..70bdb62a6d 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -100,13 +100,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmwrae. -``-tb-size`` option (since 5.0) -''''''''''''''''''''''''''''''' - -QEMU 5.0 introduced an alternative syntax to specify the size of the translation -block cache, ``-accel tcg,tb-size=``. The new syntax deprecates the -previously available ``-tb-size`` option. - ``-show-cursor`` option (since 5.0) ''''''''''''''''''''''''''''''''''' @@ -523,6 +516,11 @@ for the ``id`` parameter, which should now be used instead. The ``-no-kvm`` argument was a synonym for setting ``-machine accel=tcg``. +``-tb-size`` option (removed in 6.0) +''''''''''''''''''''''''''''''' + +QEMU 5.0 introduced an alternative syntax to specify the size of the translation +block cache, ``-accel tcg,tb-size=``. QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index 104632ea34..7ce06290b6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4080,14 +4080,6 @@ SRST Show cursor. ERST -DEF("tb-size", HAS_ARG, QEMU_OPTION_tb_size, \ - "-tb-size n set TB size\n", QEMU_ARCH_ALL) -SRST -``-tb-size n`` - Set TCG translation block cache size. Deprecated, use - '\ ``-accel tcg,tb-size=n``\ ' instead. -ERST - DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ "-incoming tcp:[host]:port[,to=maxport][,ipv4][,ipv6]\n" \ "-incoming rdma:host:port[,ipv4][,ipv6]\n" \ diff --git a/softmmu/vl.c b/softmmu/vl.c index e6e0ad5a92..3f052849d8 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3639,14 +3639,6 @@ void qemu_init(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_tb_size: -#ifndef CONFIG_TCG - error_report("TCG is disabled"); - exit(1); -#endif - warn_report("The -tb-size option is deprecated, use -accel tcg,tb-size instead"); - object_register_sugar_prop(ACCEL_CLASS_NAME("tcg"), "tb-size", optarg); - break; case QEMU_OPTION_icount: icount_opts = qemu_opts_parse_noisily(qemu_find_opts("icount"), optarg, true); -- 2.27.0