[Qemu-devel] [PATCH 0/4] Removal of deprecated -no-kvm* options

[Qemu-devel] [PATCH 0/4] Removal of deprecated -no-kvm* options

[Thomas Huth]

The -no-kvm* options are a remainder of the ancient "qemu-kvm"
fork. They have never been officially documented in our qemu-doc,
they have been marked as deprecated in the sources since a very
long time, and we've marked them as deprecated in our qemu-doc
since QEMU v2.10. So far I haven't seen any complaints that we
should keep them, so it's time to remove these old parameters now.

Thomas Huth (4):
  qemu-options: Remove remainders of the -tdf option
  qemu-options: Remove deprecated -no-kvm-pit-reinjection
  qemu-options: Remove deprecated -no-kvm-irqchip
  qemu-options: Remove deprecated -no-kvm

 qemu-doc.texi   | 15 ---------------
 qemu-options.hx | 13 -------------
 vl.c            | 21 ---------------------
 3 files changed, 49 deletions(-)

-- 
1.8.3.1

[Qemu-devel] [PATCH 1/4] qemu-options: Remove remainders of the -tdf option

[Thomas Huth]

The -tdf options has been removed with d07aa197c5a1556449361a0cbb5108e2,
but apparently I forgot to remove the corresponding two lines from
qemu-options.hx.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qemu-options.hx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index c611766..44daa10 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3924,9 +3924,6 @@ DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection,
 HXCOMM Deprecated by -machine kernel_irqchip=on|off property
 DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386)
 
-HXCOMM Deprecated (ignored)
-DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL)
-
 DEF("msg", HAS_ARG, QEMU_OPTION_msg,
     "-msg timestamp[=on|off]\n"
     "                change the format of messages\n"
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/4] qemu-options: Remove deprecated -no-kvm-pit-reinjection

[Thomas Huth]

Deprecated since the beginning when it was added for compatibility with
the ancient qemu-kvm fork of QEMU, and it even printed out the deprecation
warning since right from the start (i.e. QEMU v1.3.0), so it's really time
to remove this now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qemu-doc.texi   |  5 -----
 qemu-options.hx |  4 ----
 vl.c            | 12 ------------
 3 files changed, 21 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index 5813d27..dd39bac 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2786,11 +2786,6 @@ which is the default.
 
 @section System emulator command line arguments
 
-@subsection -no-kvm-pit-reinjection (since 1.3.0)
-
-The ``-no-kvm-pit-reinjection'' argument is now a
-synonym for setting ``-global kvm-pit.lost_tick_policy=discard''.
-
 @subsection -no-kvm-irqchip (since 1.3.0)
 
 The ``-no-kvm-irqchip'' argument is now a synonym for
diff --git a/qemu-options.hx b/qemu-options.hx
index 44daa10..9c0d60d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3917,10 +3917,6 @@ ETEXI
 HXCOMM Deprecated by -machine accel=tcg property
 DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
 
-HXCOMM Deprecated by kvm-pit driver properties
-DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection,
-    "", QEMU_ARCH_I386)
-
 HXCOMM Deprecated by -machine kernel_irqchip=on|off property
 DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386)
 
diff --git a/vl.c b/vl.c
index 7487535..24478b1 100644
--- a/vl.c
+++ b/vl.c
@@ -3741,18 +3741,6 @@ int main(int argc, char **argv, char **envp)
                 olist = qemu_find_opts("machine");
                 qemu_opts_parse_noisily(olist, "accel=tcg", false);
                 break;
-            case QEMU_OPTION_no_kvm_pit_reinjection: {
-                static GlobalProperty kvm_pit_lost_tick_policy = {
-                    .driver   = "kvm-pit",
-                    .property = "lost_tick_policy",
-                    .value    = "discard",
-                };
-
-                warn_report("deprecated, replaced by "
-                            "-global kvm-pit.lost_tick_policy=discard");
-                qdev_prop_register_global(&kvm_pit_lost_tick_policy);
-                break;
-            }
             case QEMU_OPTION_accel:
                 accel_opts = qemu_opts_parse_noisily(qemu_find_opts("accel"),
                                                      optarg, true);
-- 
1.8.3.1

[Qemu-devel] [PATCH 3/4] qemu-options: Remove deprecated -no-kvm-irqchip

[Thomas Huth]

We've never documented this option in our qemu-doc, so unless the users
used qemu-kvm before, they never should never have been aware of this
option. It's been marked as deprecated in the source code since a long
time already, and officially marked as deprecated in the documentation
since QEMU v2.10, so it should be fine to remove this now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qemu-doc.texi   | 5 -----
 qemu-options.hx | 3 ---
 vl.c            | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index dd39bac..f605557 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2786,11 +2786,6 @@ which is the default.
 
 @section System emulator command line arguments
 
-@subsection -no-kvm-irqchip (since 1.3.0)
-
-The ``-no-kvm-irqchip'' argument is now a synonym for
-setting ``-machine kernel_irqchip=off''.
-
 @subsection -no-kvm (since 1.3.0)
 
 The ``-no-kvm'' argument is now a synonym for setting
diff --git a/qemu-options.hx b/qemu-options.hx
index 9c0d60d..870a363 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3917,9 +3917,6 @@ ETEXI
 HXCOMM Deprecated by -machine accel=tcg property
 DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
 
-HXCOMM Deprecated by -machine kernel_irqchip=on|off property
-DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386)
-
 DEF("msg", HAS_ARG, QEMU_OPTION_msg,
     "-msg timestamp[=on|off]\n"
     "                change the format of messages\n"
diff --git a/vl.c b/vl.c
index 24478b1..0d77a48 100644
--- a/vl.c
+++ b/vl.c
@@ -3185,11 +3185,6 @@ int main(int argc, char **argv, char **envp)
                 exit(1);
             }
             switch(popt->index) {
-            case QEMU_OPTION_no_kvm_irqchip: {
-                olist = qemu_find_opts("machine");
-                qemu_opts_parse_noisily(olist, "kernel_irqchip=off", false);
-                break;
-            }
             case QEMU_OPTION_cpu:
                 /* hw initialization will check this */
                 cpu_model = optarg;
-- 
1.8.3.1

[Qemu-devel] [PATCH 4/4] qemu-options: Remove deprecated -no-kvm

[Thomas Huth]

We've never documented this option in our qemu-doc, so unless the users
used qemu-kvm before, they never should never have been aware of this
option. It's been marked as deprecated in the source code since a long
time already, and officially marked as deprecated in the documentation
since QEMU v2.10, so it should be fine to remove this now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qemu-doc.texi   | 5 -----
 qemu-options.hx | 3 ---
 vl.c            | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index f605557..1c61a6a 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2786,11 +2786,6 @@ which is the default.
 
 @section System emulator command line arguments
 
-@subsection -no-kvm (since 1.3.0)
-
-The ``-no-kvm'' argument is now a synonym for setting
-``-machine accel=tcg''.
-
 @subsection -vnc tls (since 2.5.0)
 
 The ``-vnc tls'' argument is now a synonym for setting
diff --git a/qemu-options.hx b/qemu-options.hx
index 870a363..d77a968 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3914,9 +3914,6 @@ STEXI
 Enable FIPS 140-2 compliance mode.
 ETEXI
 
-HXCOMM Deprecated by -machine accel=tcg property
-DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)
-
 DEF("msg", HAS_ARG, QEMU_OPTION_msg,
     "-msg timestamp[=on|off]\n"
     "                change the format of messages\n"
diff --git a/vl.c b/vl.c
index 0d77a48..593b197 100644
--- a/vl.c
+++ b/vl.c
@@ -3732,10 +3732,6 @@ int main(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);
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 1/4] qemu-options: Remove remainders of the -tdf option

[Markus Armbruster]

Thomas Huth <thuth@redhat.com> writes:

> The -tdf options has been removed with d07aa197c5a1556449361a0cbb5108e2,
> but apparently I forgot to remove the corresponding two lines from
> qemu-options.hx.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  qemu-options.hx | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index c611766..44daa10 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -3924,9 +3924,6 @@ DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection,
>  HXCOMM Deprecated by -machine kernel_irqchip=on|off property
>  DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386)
>  
> -HXCOMM Deprecated (ignored)
> -DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL)
> -
>  DEF("msg", HAS_ARG, QEMU_OPTION_msg,
>      "-msg timestamp[=on|off]\n"
>      "                change the format of messages\n"

Makes me wonder what happens when you specify --tdf.  Aha: nothing.
Why?  main() passes unknown options to os_parse_cmd_args(), which
happily ignores them.  Its function comment "return 0 if option handled,
-1 otherwise" is bogus.  Needs cleanup.  Separate patch, not necessarily
in this series.

Suggest to mention in your commit message that --tdf is silently
ignored.  Feel free to also point out the need for cleanup there.

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH 4/4] qemu-options: Remove deprecated -no-kvm

[Markus Armbruster]

Thomas Huth <thuth@redhat.com> writes:

> We've never documented this option in our qemu-doc, so unless the users
> used qemu-kvm before, they never should never have been aware of this

You're serious about "never", aren't you?  ;->

> option. It's been marked as deprecated in the source code since a long

s/since/for/

> time already, and officially marked as deprecated in the documentation
> since QEMU v2.10, so it should be fine to remove this now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

With the commit message touched up:
Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH 2/4] qemu-options: Remove deprecated -no-kvm-pit-reinjection

[Markus Armbruster]

Thomas Huth <thuth@redhat.com> writes:

> Deprecated since the beginning when it was added for compatibility with
> the ancient qemu-kvm fork of QEMU, and it even printed out the deprecation
> warning since right from the start (i.e. QEMU v1.3.0), so it's really time
> to remove this now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH 3/4] qemu-options: Remove deprecated -no-kvm-irqchip

[Markus Armbruster]

Thomas Huth <thuth@redhat.com> writes:

> We've never documented this option in our qemu-doc, so unless the users
> used qemu-kvm before, they never should never have been aware of this
> option. It's been marked as deprecated in the source code since a long
> time already, and officially marked as deprecated in the documentation
> since QEMU v2.10, so it should be fine to remove this now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

With the commit message touched up like PATCH 4's:
Reviewed-by: Markus Armbruster <armbru@redhat.com>