Patchwork Legacy qemu-kvm options have no argument

login
register
mail settings
Submitter Bruce Rogers
Date Nov. 20, 2012, 2:11 p.m.
Message ID <1353420681-8870-1-git-send-email-brogers@suse.com>
Download mbox | patch
Permalink /patch/200364/
State New
Headers show

Comments

Bruce Rogers - Nov. 20, 2012, 2:11 p.m.
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 <brogers@suse.com>
---
 qemu-options.hx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Markus Armbruster - Nov. 20, 2012, 3:14 p.m.
Cc'ing Marcelo & Jan to speed up patch application.

Bruce Rogers <brogers@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 <brogers@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)
Jan Kiszka - Nov. 21, 2012, 12:12 p.m.
On 2012-11-20 16:14, Markus Armbruster wrote:
> Cc'ing Marcelo & Jan to speed up patch application.
> 
> Bruce Rogers <brogers@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 <brogers@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.kiszka@siemens.com>
Luiz Capitulino - Nov. 22, 2012, 12:34 p.m.
On Wed, 21 Nov 2012 13:12:53 +0100
Jan Kiszka <jan.kiszka@siemens.com> wrote:

> On 2012-11-20 16:14, Markus Armbruster wrote:
> > Cc'ing Marcelo & Jan to speed up patch application.
> > 
> > Bruce Rogers <brogers@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 <brogers@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.kiszka@siemens.com>

Candidate for -trivial.
Stefan Hajnoczi - Nov. 23, 2012, 6:49 a.m.
On Tue, Nov 20, 2012 at 07:11:21AM -0700, Bruce Rogers wrote:
> 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 <brogers@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)
> -- 
> 1.7.7

Anthony, please consider this patch for QEMU 1.3-rc1.  Without it the
deprecated qemu-kvm options don't work!

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Stefan
Stefan Hajnoczi - Nov. 23, 2012, 6:50 a.m.
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.kiszka@siemens.com> wrote:
> 
> > On 2012-11-20 16:14, Markus Armbruster wrote:
> > > Cc'ing Marcelo & Jan to speed up patch application.
> > > 
> > > Bruce Rogers <brogers@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 <brogers@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.kiszka@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.

Stefan
Luiz Capitulino - Nov. 23, 2012, 11:48 a.m.
On Fri, 23 Nov 2012 07:50:49 +0100
Stefan Hajnoczi <stefanha@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.kiszka@siemens.com> wrote:
> > 
> > > On 2012-11-20 16:14, Markus Armbruster wrote:
> > > > Cc'ing Marcelo & Jan to speed up patch application.
> > > > 
> > > > Bruce Rogers <brogers@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 <brogers@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.kiszka@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!

Patch

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)