Skip to content

Commit

Permalink
Use global properties to emulate -no-kvm-pit-reinjection
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jan-kiszka authored and matosatti committed Oct 31, 2012
1 parent 4086bde commit c21fb4f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
4 changes: 4 additions & 0 deletions qemu-options.hx
Expand Up @@ -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)

Expand Down
15 changes: 15 additions & 0 deletions vl.c
Expand Up @@ -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) {
Expand Down

0 comments on commit c21fb4f

Please sign in to comment.