aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-10-05 14:51:42 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2012-10-30 23:39:51 -0200
commitc21fb4f8b802108697f9353a8f807079507b586c (patch)
tree1038ee9508e6390a973af24b3f6cdd847c0faf26
parent4086bde8c08746913d7ca6dcbc5e18a49a627cdc (diff)
Use global properties to emulate -no-kvm-pit-reinjection
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-reinjection. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--qemu-options.hx4
-rw-r--r--vl.c15
2 files changed, 19 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 42e642c65b..4403c9c718 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2888,6 +2888,10 @@ STEXI
Enable FIPS 140-2 compliance mode.
ETEXI
+HXCOMM Deprecated by kvm-pit driver properties
+DEF("no-kvm-pit-reinjection", HAS_ARG, QEMU_OPTION_no_kvm_pit_reinjection,
+ "", QEMU_ARCH_I386)
+
HXCOMM Deprecated (ignored)
DEF("no-kvm-pit", HAS_ARG, QEMU_OPTION_no_kvm_pit, "", QEMU_ARCH_I386)
diff --git a/vl.c b/vl.c
index 37717b4559..3068b4bc59 100644
--- a/vl.c
+++ b/vl.c
@@ -3176,6 +3176,21 @@ int main(int argc, char **argv, char **envp)
"separately.\n");
break;
}
+ case QEMU_OPTION_no_kvm_pit_reinjection: {
+ static GlobalProperty kvm_pit_lost_tick_policy[] = {
+ {
+ .driver = "kvm-pit",
+ .property = "lost_tick_policy",
+ .value = "discard",
+ },
+ { /* end of list */ }
+ };
+
+ fprintf(stderr, "Warning: option deprecated, use "
+ "lost_tick_policy property of kvm-pit instead.\n");
+ qdev_prop_register_global_list(kvm_pit_lost_tick_policy);
+ break;
+ }
case QEMU_OPTION_usb:
machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
if (machine_opts) {