From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Fri, 5 Oct 2012 17:51:41 +0000 (-0300)
Subject: Issue warning when deprecated -no-kvm-pit is used
X-Git-Tag: v1.3.0-rc0~90^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4086bde8c08746913d7ca6dcbc5e18a49a627cdc;p=thirdparty%2Fqemu.git

Issue warning when deprecated -no-kvm-pit is used

Releases of qemu-kvm will be interrupted at qemu 1.3.0.
Users should switch to plain qemu releases.
To avoid breaking scenarios which are setup with command line
options specific to qemu-kvm, port these switches from qemu-kvm
to qemu.git.

Port -no-kvm-pit option.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/qemu-options.hx b/qemu-options.hx
index d813755ccb2..42e642c65b5 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2888,6 +2888,9 @@ STEXI
 Enable FIPS 140-2 compliance mode.
 ETEXI
 
+HXCOMM Deprecated (ignored)
+DEF("no-kvm-pit", HAS_ARG, QEMU_OPTION_no_kvm_pit, "", QEMU_ARCH_I386)
+
 HXCOMM Deprecated by -machine kernel_irqchip=on|off property
 DEF("no-kvm-irqchip", HAS_ARG, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386)
 
diff --git a/vl.c b/vl.c
index 7d0708afcdc..37717b45599 100644
--- a/vl.c
+++ b/vl.c
@@ -3171,6 +3171,11 @@ int main(int argc, char **argv, char **envp)
                     machine = machine_parse(optarg);
                 }
                 break;
+            case QEMU_OPTION_no_kvm_pit: {
+                fprintf(stderr, "Warning: KVM PIT can no longer be disabled "
+                                "separately.\n");
+                break;
+            }
             case QEMU_OPTION_usb:
                 machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
                 if (machine_opts) {