aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-10-05 14:51:41 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2012-10-30 23:39:50 -0200
commit4086bde8c08746913d7ca6dcbc5e18a49a627cdc (patch)
tree6d5e05ebc09041f8d8f435f06aab8869ca19bff4
parente43d594ee55038442d59d301eb34fdf0c378d3a4 (diff)
downloadqemu-4086bde8c08746913d7ca6dcbc5e18a49a627cdc.zip
qemu-4086bde8c08746913d7ca6dcbc5e18a49a627cdc.tar.gz
qemu-4086bde8c08746913d7ca6dcbc5e18a49a627cdc.tar.bz2
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>
-rw-r--r--qemu-options.hx3
-rw-r--r--vl.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index d813755..42e642c 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 7d0708a..37717b4 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) {