Message ID | 20121003105509.528026359@amt.cnet |
---|---|
State | New |
Headers | show |
Marcelo Tosatti <mtosatti@redhat.com> writes: > Commit 80019541e9c13fab476bee35edcef3e11646222c from qemu-kvm.git. > > From: Jan Kiszka <jan.kiszka@siemens.com> > > Use global properties to emulate -no-kvm-pit-reinjection > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Regards, Anthony Liguori > > Index: qemu-compat-kvm/vl.c > =================================================================== > --- qemu-compat-kvm.orig/vl.c > +++ qemu-compat-kvm/vl.c > @@ -3071,6 +3071,21 @@ int main(int argc, char **argv, char **e > "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: > usb_enabled = 1; > break; > Index: qemu-compat-kvm/qemu-options.hx > =================================================================== > --- qemu-compat-kvm.orig/qemu-options.hx > +++ qemu-compat-kvm/qemu-options.hx > @@ -2844,7 +2844,10 @@ DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_ > DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit, > "-no-kvm-pit disable KVM kernel mode PIT\n", > QEMU_ARCH_I386) > - > +DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection, > + "-no-kvm-pit-reinjection\n" > + " disable KVM kernel mode PIT interrupt reinjection\n", > + QEMU_ARCH_I386) > > HXCOMM This is the last statement. Insert new options before this line! > STEXI > > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: qemu-compat-kvm/vl.c =================================================================== --- qemu-compat-kvm.orig/vl.c +++ qemu-compat-kvm/vl.c @@ -3071,6 +3071,21 @@ int main(int argc, char **argv, char **e "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: usb_enabled = 1; break; Index: qemu-compat-kvm/qemu-options.hx =================================================================== --- qemu-compat-kvm.orig/qemu-options.hx +++ qemu-compat-kvm/qemu-options.hx @@ -2844,7 +2844,10 @@ DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_ DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit, "-no-kvm-pit disable KVM kernel mode PIT\n", QEMU_ARCH_I386) - +DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection, + "-no-kvm-pit-reinjection\n" + " disable KVM kernel mode PIT interrupt reinjection\n", + QEMU_ARCH_I386) HXCOMM This is the last statement. Insert new options before this line! STEXI