On Fri, 23 Nov 2012 07:50:49 +0100 Stefan Hajnoczi <stefa...@gmail.com> wrote:
> On Thu, Nov 22, 2012 at 10:34:11AM -0200, Luiz Capitulino wrote: > > On Wed, 21 Nov 2012 13:12:53 +0100 > > Jan Kiszka <jan.kis...@siemens.com> wrote: > > > > > On 2012-11-20 16:14, Markus Armbruster wrote: > > > > Cc'ing Marcelo & Jan to speed up patch application. > > > > > > > > Bruce Rogers <brog...@suse.com> writes: > > > > > > > >> The options no-kvm, no-kvm-pit, no-kvm-pit-reinjection, and > > > >> no-kvm-irqchip > > > >> should be marked as having no argument. > > > >> > > > >> Signed-off-by: Bruce Rogers <brog...@suse.com> > > > >> --- > > > >> qemu-options.hx | 8 ++++---- > > > >> 1 files changed, 4 insertions(+), 4 deletions(-) > > > >> > > > >> diff --git a/qemu-options.hx b/qemu-options.hx > > > >> index 9bb29d3..fbcf079 100644 > > > >> --- a/qemu-options.hx > > > >> +++ b/qemu-options.hx > > > >> @@ -2918,17 +2918,17 @@ Enable FIPS 140-2 compliance mode. > > > >> ETEXI > > > >> > > > >> HXCOMM Deprecated by -machine accel=tcg property > > > >> -DEF("no-kvm", HAS_ARG, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) > > > >> +DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) > > > >> > > > >> HXCOMM Deprecated by kvm-pit driver properties > > > >> -DEF("no-kvm-pit-reinjection", HAS_ARG, > > > >> QEMU_OPTION_no_kvm_pit_reinjection, > > > >> +DEF("no-kvm-pit-reinjection", 0, 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) > > > >> +DEF("no-kvm-pit", 0, 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) > > > >> +DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", > > > >> QEMU_ARCH_I386) > > > >> > > > >> HXCOMM Deprecated (ignored) > > > >> DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL) > > > > > > Reviewed-by: Jan Kiszka <jan.kis...@siemens.com> > > > > Candidate for -trivial. > > This is more urgent than trivial. It is necessary for qemu-kvm > compatibility and I think should go into QEMU 1.3. Otherwise we have to > wait until QEMU 1.4 to complete the qemu-kvm -> qemu transition. That's true, I missed the fact that you don't do pull requests during hard freeze... Thanks!