[PATCH v2] Remove deprecated -no-kvm option

Thomas Huth posted 1 patch 3 years, 5 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
docs/system/deprecated.rst | 11 ++++++-----
qemu-options.hx            |  3 ---
softmmu/vl.c               |  4 ----
3 files changed, 6 insertions(+), 12 deletions(-)
[PATCH v2] Remove deprecated -no-kvm option
Posted by Thomas Huth 3 years, 5 months ago
The option has never been mentioned in our documentation, it's been
deprecated since years, it's marked with QEMU_ARCH_I386 (which does
not make sense anymore since KVM is available on other architectures,
too), it does not do anything by default in upstream QEMU (since TCG
is the default here anyway), and we're spending too much precious time
each year discussing whether it makes sense to keep this option as a
nice suger or not... let's finally put an end on this and remove it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 v2: Mention the parameter in the "removed feature" section (thanks Paolo!)

 docs/system/deprecated.rst | 11 ++++++-----
 qemu-options.hx            |  3 ---
 softmmu/vl.c               |  4 ----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 905628f3a0..9bae13bc01 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -27,11 +27,6 @@ System emulator command line arguments
 The ``enforce-config-section`` parameter is replaced by the
 ``-global migration.send-configuration={on|off}`` option.
 
-``-no-kvm`` (since 1.3.0)
-'''''''''''''''''''''''''
-
-The ``-no-kvm`` argument is now a synonym for setting ``-accel tcg``.
-
 ``-usbdevice`` (since 2.10.0)
 '''''''''''''''''''''''''''''
 
@@ -504,6 +499,12 @@ System emulator command line arguments
 The ``name`` parameter of the ``-net`` option was a synonym
 for the ``id`` parameter, which should now be used instead.
 
+``-no-kvm`` (removed in 5.2)
+''''''''''''''''''''''''''''
+
+The ``-no-kvm`` argument was a synonym for setting ``-accel tcg``.
+
+
 QEMU Machine Protocol (QMP) commands
 ------------------------------------
 
diff --git a/qemu-options.hx b/qemu-options.hx
index 1da52a269c..9e1ace04f7 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4351,9 +4351,6 @@ SRST
     Enable FIPS 140-2 compliance mode.
 ERST
 
-HXCOMM Deprecated by -accel tcg
-DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
-
 DEF("msg", HAS_ARG, QEMU_OPTION_msg,
     "-msg [timestamp[=on|off]][,guest-name=[on|off]]\n"
     "                control error message format\n"
diff --git a/softmmu/vl.c b/softmmu/vl.c
index cb476aa70b..6f5b000f07 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3502,10 +3502,6 @@ void qemu_init(int argc, char **argv, char **envp)
                     exit(1);
                 }
                 break;
-             case QEMU_OPTION_no_kvm:
-                olist = qemu_find_opts("machine");
-                qemu_opts_parse_noisily(olist, "accel=tcg", false);
-                break;
             case QEMU_OPTION_accel:
                 accel_opts = qemu_opts_parse_noisily(qemu_find_opts("accel"),
                                                      optarg, true);
-- 
2.18.2

Re: [PATCH v2] Remove deprecated -no-kvm option
Posted by John Snow 3 years, 5 months ago
On 10/20/20 12:05 PM, Thomas Huth wrote:
> The option has never been mentioned in our documentation, it's been
> deprecated since years, it's marked with QEMU_ARCH_I386 (which does
> not make sense anymore since KVM is available on other architectures,
> too), it does not do anything by default in upstream QEMU (since TCG
> is the default here anyway), and we're spending too much precious time
> each year discussing whether it makes sense to keep this option as a
> nice suger or not... let's finally put an end on this and remove it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   v2: Mention the parameter in the "removed feature" section (thanks Paolo!)
> 
>   docs/system/deprecated.rst | 11 ++++++-----
>   qemu-options.hx            |  3 ---
>   softmmu/vl.c               |  4 ----
>   3 files changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
> index 905628f3a0..9bae13bc01 100644
> --- a/docs/system/deprecated.rst
> +++ b/docs/system/deprecated.rst
> @@ -27,11 +27,6 @@ System emulator command line arguments
>   The ``enforce-config-section`` parameter is replaced by the
>   ``-global migration.send-configuration={on|off}`` option.
>   
> -``-no-kvm`` (since 1.3.0)
> -'''''''''''''''''''''''''
> -
> -The ``-no-kvm`` argument is now a synonym for setting ``-accel tcg``.
> -
>   ``-usbdevice`` (since 2.10.0)
>   '''''''''''''''''''''''''''''
>   
> @@ -504,6 +499,12 @@ System emulator command line arguments
>   The ``name`` parameter of the ``-net`` option was a synonym
>   for the ``id`` parameter, which should now be used instead.
>   
> +``-no-kvm`` (removed in 5.2)
> +''''''''''''''''''''''''''''
> +
> +The ``-no-kvm`` argument was a synonym for setting ``-accel tcg``.
> +
> +
>   QEMU Machine Protocol (QMP) commands
>   ------------------------------------
>   
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 1da52a269c..9e1ace04f7 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -4351,9 +4351,6 @@ SRST
>       Enable FIPS 140-2 compliance mode.
>   ERST
>   
> -HXCOMM Deprecated by -accel tcg
> -DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
> -
>   DEF("msg", HAS_ARG, QEMU_OPTION_msg,
>       "-msg [timestamp[=on|off]][,guest-name=[on|off]]\n"
>       "                control error message format\n"
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index cb476aa70b..6f5b000f07 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -3502,10 +3502,6 @@ void qemu_init(int argc, char **argv, char **envp)
>                       exit(1);
>                   }
>                   break;
> -             case QEMU_OPTION_no_kvm:
> -                olist = qemu_find_opts("machine");
> -                qemu_opts_parse_noisily(olist, "accel=tcg", false);
> -                break;
>               case QEMU_OPTION_accel:
>                   accel_opts = qemu_opts_parse_noisily(qemu_find_opts("accel"),
>                                                        optarg, true);
> 

One down, 130 to go? *g*

Reviewed-by: John Snow <jsnow@redhat.com>

Re: [PATCH v2] Remove deprecated -no-kvm option
Posted by Paolo Bonzini 3 years, 5 months ago
On 20/10/20 18:05, Thomas Huth wrote:
> The option has never been mentioned in our documentation, it's been
> deprecated since years, it's marked with QEMU_ARCH_I386 (which does
> not make sense anymore since KVM is available on other architectures,
> too), it does not do anything by default in upstream QEMU (since TCG
> is the default here anyway), and we're spending too much precious time
> each year discussing whether it makes sense to keep this option as a
> nice suger or not... let's finally put an end on this and remove it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  v2: Mention the parameter in the "removed feature" section (thanks Paolo!)
> 
>  docs/system/deprecated.rst | 11 ++++++-----
>  qemu-options.hx            |  3 ---
>  softmmu/vl.c               |  4 ----
>  3 files changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
> index 905628f3a0..9bae13bc01 100644
> --- a/docs/system/deprecated.rst
> +++ b/docs/system/deprecated.rst
> @@ -27,11 +27,6 @@ System emulator command line arguments
>  The ``enforce-config-section`` parameter is replaced by the
>  ``-global migration.send-configuration={on|off}`` option.
>  
> -``-no-kvm`` (since 1.3.0)
> -'''''''''''''''''''''''''
> -
> -The ``-no-kvm`` argument is now a synonym for setting ``-accel tcg``.
> -
>  ``-usbdevice`` (since 2.10.0)
>  '''''''''''''''''''''''''''''
>  
> @@ -504,6 +499,12 @@ System emulator command line arguments
>  The ``name`` parameter of the ``-net`` option was a synonym
>  for the ``id`` parameter, which should now be used instead.
>  
> +``-no-kvm`` (removed in 5.2)
> +''''''''''''''''''''''''''''
> +
> +The ``-no-kvm`` argument was a synonym for setting ``-accel tcg``.

Changed this to ``-machine accel=tcg`` and queued, thanks.

(In case you're wondering, the difference is that it prevents ``-no-kvm
-accel kvm`` from working).

Paolo