[Qemu-devel] [patch 0/6] qemu-kvm compat

[Qemu-devel] [patch 0/6] qemu-kvm compat

[Marcelo Tosatti]

As discussed on yesterdays qemu call, follows qemu-kvm compat patches 
for qemu:

    - command line compatibility
    - allow configurable ram size for cirrus 

[Qemu-devel] [patch 1/6] cirrus_vga: allow configurable vram size

[Marcelo Tosatti]

[-- Attachment #1: cirrus-add-configurable-memsize --]
[-- Type: text/plain, Size: 2980 bytes --]

Allow RAM size to be configurable for cirrus, to allow migration 
compatibility from qemu-kvm.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu-compat-kvm/hw/cirrus_vga.c
===================================================================
--- qemu-compat-kvm.orig/hw/cirrus_vga.c
+++ qemu-compat-kvm/hw/cirrus_vga.c
@@ -43,8 +43,6 @@
 //#define DEBUG_CIRRUS
 //#define DEBUG_BITBLT
 
-#define VGA_RAM_SIZE (8192 * 1024)
-
 /***************************************
  *
  *  definitions
@@ -2853,7 +2851,8 @@ static void cirrus_init_common(CirrusVGA
 
     /* I/O handler for LFB */
     memory_region_init_io(&s->cirrus_linear_io, &cirrus_linear_io_ops, s,
-                          "cirrus-linear-io", VGA_RAM_SIZE);
+                          "cirrus-linear-io", s->vga.vram_size_mb
+					      * 1024 * 1024);
 
     /* I/O handler for LFB */
     memory_region_init_io(&s->cirrus_linear_bitblt_io,
@@ -2893,7 +2892,6 @@ static int vga_initfn(ISADevice *dev)
     ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev);
     VGACommonState *s = &d->cirrus_vga.vga;
 
-    s->vram_size_mb = VGA_RAM_SIZE >> 20;
     vga_common_init(s);
     cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0,
                        isa_address_space(dev));
@@ -2906,6 +2904,12 @@ static int vga_initfn(ISADevice *dev)
     return 0;
 }
 
+static Property isa_vga_cirrus_properties[] = {
+    DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,
+                       cirrus_vga.vga.vram_size_mb, 8),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
 {
     ISADeviceClass *k = ISA_DEVICE_CLASS(klass);
@@ -2913,6 +2917,7 @@ static void isa_cirrus_vga_class_init(Ob
 
     dc->vmsd  = &vmstate_cirrus_vga;
     k->init   = vga_initfn;
+    dc->props = isa_vga_cirrus_properties;
 }
 
 static TypeInfo isa_cirrus_vga_info = {
@@ -2936,7 +2941,6 @@ static int pci_cirrus_vga_initfn(PCIDevi
      int16_t device_id = pc->device_id;
 
      /* setup VGA */
-     s->vga.vram_size_mb = VGA_RAM_SIZE >> 20;
      vga_common_init(&s->vga);
      cirrus_init_common(s, device_id, 1, pci_address_space(dev));
      s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
@@ -2968,6 +2972,12 @@ DeviceState *pci_cirrus_vga_init(PCIBus 
     return &pci_create_simple(bus, -1, "cirrus-vga")->qdev;
 }
 
+static Property pci_vga_cirrus_properties[] = {
+    DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,
+                       cirrus_vga.vga.vram_size_mb, 8),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void cirrus_vga_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -2981,6 +2991,7 @@ static void cirrus_vga_class_init(Object
     k->class_id = PCI_CLASS_DISPLAY_VGA;
     dc->desc = "Cirrus CLGD 54xx VGA";
     dc->vmsd = &vmstate_pci_cirrus_vga;
+    dc->props = pci_vga_cirrus_properties;
 }
 
 static TypeInfo cirrus_vga_info = {

Re: [Qemu-devel] [patch 1/6] cirrus_vga: allow configurable vram size

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> Allow RAM size to be configurable for cirrus, to allow migration 
> compatibility from qemu-kvm.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

>
> Index: qemu-compat-kvm/hw/cirrus_vga.c
> ===================================================================
> --- qemu-compat-kvm.orig/hw/cirrus_vga.c
> +++ qemu-compat-kvm/hw/cirrus_vga.c
> @@ -43,8 +43,6 @@
>  //#define DEBUG_CIRRUS
>  //#define DEBUG_BITBLT
>  
> -#define VGA_RAM_SIZE (8192 * 1024)
> -
>  /***************************************
>   *
>   *  definitions
> @@ -2853,7 +2851,8 @@ static void cirrus_init_common(CirrusVGA
>  
>      /* I/O handler for LFB */
>      memory_region_init_io(&s->cirrus_linear_io, &cirrus_linear_io_ops, s,
> -                          "cirrus-linear-io", VGA_RAM_SIZE);
> +                          "cirrus-linear-io", s->vga.vram_size_mb
> +					      * 1024 * 1024);
>  
>      /* I/O handler for LFB */
>      memory_region_init_io(&s->cirrus_linear_bitblt_io,
> @@ -2893,7 +2892,6 @@ static int vga_initfn(ISADevice *dev)
>      ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev);
>      VGACommonState *s = &d->cirrus_vga.vga;
>  
> -    s->vram_size_mb = VGA_RAM_SIZE >> 20;
>      vga_common_init(s);
>      cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0,
>                         isa_address_space(dev));
> @@ -2906,6 +2904,12 @@ static int vga_initfn(ISADevice *dev)
>      return 0;
>  }
>  
> +static Property isa_vga_cirrus_properties[] = {
> +    DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,
> +                       cirrus_vga.vga.vram_size_mb, 8),
> +    DEFINE_PROP_END_OF_LIST(),
> +};
> +
>  static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
>  {
>      ISADeviceClass *k = ISA_DEVICE_CLASS(klass);
> @@ -2913,6 +2917,7 @@ static void isa_cirrus_vga_class_init(Ob
>  
>      dc->vmsd  = &vmstate_cirrus_vga;
>      k->init   = vga_initfn;
> +    dc->props = isa_vga_cirrus_properties;
>  }
>  
>  static TypeInfo isa_cirrus_vga_info = {
> @@ -2936,7 +2941,6 @@ static int pci_cirrus_vga_initfn(PCIDevi
>       int16_t device_id = pc->device_id;
>  
>       /* setup VGA */
> -     s->vga.vram_size_mb = VGA_RAM_SIZE >> 20;
>       vga_common_init(&s->vga);
>       cirrus_init_common(s, device_id, 1, pci_address_space(dev));
>       s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
> @@ -2968,6 +2972,12 @@ DeviceState *pci_cirrus_vga_init(PCIBus 
>      return &pci_create_simple(bus, -1, "cirrus-vga")->qdev;
>  }
>  
> +static Property pci_vga_cirrus_properties[] = {
> +    DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,
> +                       cirrus_vga.vga.vram_size_mb, 8),
> +    DEFINE_PROP_END_OF_LIST(),
> +};
> +
>  static void cirrus_vga_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -2981,6 +2991,7 @@ static void cirrus_vga_class_init(Object
>      k->class_id = PCI_CLASS_DISPLAY_VGA;
>      dc->desc = "Cirrus CLGD 54xx VGA";
>      dc->vmsd = &vmstate_pci_cirrus_vga;
> +    dc->props = pci_vga_cirrus_properties;
>  }
>  
>  static TypeInfo cirrus_vga_info = {
>
>
> --
> 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

[Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Marcelo Tosatti]

[-- Attachment #1: qemukvm-commandline-nokvmirqchip --]
[-- Type: text/plain, Size: 1439 bytes --]

Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.

From: Jan Kiszka <jan.kiszka@siemens.com>
    
Upstream is moving towards this mechanism, so start using it in qemu-kvm
already to configure the specific defaults: kvm enabled on, just like
in-kernel irqchips.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu-compat-kvm/vl.c
===================================================================
--- qemu-compat-kvm.orig/vl.c
+++ qemu-compat-kvm/vl.c
@@ -3061,6 +3061,12 @@ int main(int argc, char **argv, char **e
                     machine = machine_parse(optarg);
                 }
                 break;
+            case QEMU_OPTION_no_kvm_irqchip: {
+                olist = qemu_find_opts("machine");
+                qemu_opts_parse(olist, "kernel_irqchip=off", 0);
+                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
@@ -2838,6 +2838,10 @@ STEXI
 Enable FIPS 140-2 compliance mode.
 ETEXI
 
+DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
+    "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
+    QEMU_ARCH_I386)
+
 HXCOMM This is the last statement. Insert new options before this line!
 STEXI
 @end table

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>     
> Upstream is moving towards this mechanism, so start using it in qemu-kvm
> already to configure the specific defaults: kvm enabled on, just like
> in-kernel irqchips.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>


Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Although it's a little odd to have From: Jan without a SoB...

Regards,

Anthony Liguori


>
> Index: qemu-compat-kvm/vl.c
> ===================================================================
> --- qemu-compat-kvm.orig/vl.c
> +++ qemu-compat-kvm/vl.c
> @@ -3061,6 +3061,12 @@ int main(int argc, char **argv, char **e
>                      machine = machine_parse(optarg);
>                  }
>                  break;
> +            case QEMU_OPTION_no_kvm_irqchip: {
> +                olist = qemu_find_opts("machine");
> +                qemu_opts_parse(olist, "kernel_irqchip=off", 0);
> +                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
> @@ -2838,6 +2838,10 @@ STEXI
>  Enable FIPS 140-2 compliance mode.
>  ETEXI
>  
> +DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
> +    "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
> +    QEMU_ARCH_I386)
> +
>  HXCOMM This is the last statement. Insert new options before this line!
>  STEXI
>  @end table
>
>
> --
> 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

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Marcelo Tosatti]

On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
> Marcelo Tosatti <mtosatti@redhat.com> writes:
> 
> > Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
> >
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> >     
> > Upstream is moving towards this mechanism, so start using it in qemu-kvm
> > already to configure the specific defaults: kvm enabled on, just like
> > in-kernel irqchips.
> >
> > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> 
> 
> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
> 
> Although it's a little odd to have From: Jan without a SoB...

Agree, Jan can you ACK?

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]

On 2012-10-03 17:03, Marcelo Tosatti wrote:
> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>>
>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>>>
>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>     
>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
>>> already to configure the specific defaults: kvm enabled on, just like
>>> in-kernel irqchips.
>>>
>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>>
>>
>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>>
>> Although it's a little odd to have From: Jan without a SoB...
> 
> Agree, Jan can you ACK?

I wasn't able to join the call yesterday: Is there a removal schedule
associated with those switches? Also, why pushing things upstream, even
when only for one release, that have been loudly deprecated for a while
in qemu-kvm? Some switches are lacking deprecated warnings on the
console, and -no-kvm is missing completely. I tend to focus on patch 1 &
5, dropping the rest - based on relevance for production use.

Jan



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]

On 2012-10-03 17:46, Jan Kiszka wrote:
> On 2012-10-03 17:03, Marcelo Tosatti wrote:
>> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
>>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>>>
>>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>>>>
>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>>     
>>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
>>>> already to configure the specific defaults: kvm enabled on, just like
>>>> in-kernel irqchips.
>>>>
>>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>>>
>>>
>>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>>>
>>> Although it's a little odd to have From: Jan without a SoB...
>>
>> Agree, Jan can you ACK?
> 
> I wasn't able to join the call yesterday: Is there a removal schedule
> associated with those switches? Also, why pushing things upstream, even
> when only for one release, that have been loudly deprecated for a while
> in qemu-kvm? Some switches are lacking deprecated warnings on the
> console, and -no-kvm is missing completely. I tend to focus on patch 1 &
> 5, dropping the rest - based on relevance for production use.

I guess patch 4 is fine as well, so consider 4 & 5 ack'ed.

Jan



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Anthony Liguori]

Jan Kiszka <jan.kiszka@web.de> writes:

> On 2012-10-03 17:03, Marcelo Tosatti wrote:
>> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
>>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>>>
>>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>>>>
>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>>     
>>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
>>>> already to configure the specific defaults: kvm enabled on, just like
>>>> in-kernel irqchips.
>>>>
>>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>>>
>>>
>>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>>>
>>> Although it's a little odd to have From: Jan without a SoB...
>> 
>> Agree, Jan can you ACK?
>
> I wasn't able to join the call yesterday: Is there a removal schedule
> associated with those switches? Also, why pushing things upstream, even
> when only for one release, that have been loudly deprecated for a while
> in qemu-kvm? Some switches are lacking deprecated warnings on the
> console, and -no-kvm is missing completely. I tend to focus on patch 1 &
> 5, dropping the rest - based on relevance for production use.

The distros need to keep these flags to do the switch.  I see no point
in deprecating them since they're trivially easy to maintain.

So we'd just support them forever.

Regards,

Anthony Liguori

>
> Jan

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

On 2012-10-03 19:16, Anthony Liguori wrote:
> Jan Kiszka <jan.kiszka@web.de> writes:
> 
>> On 2012-10-03 17:03, Marcelo Tosatti wrote:
>>> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
>>>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>>>>
>>>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>>>>>
>>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>>>     
>>>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
>>>>> already to configure the specific defaults: kvm enabled on, just like
>>>>> in-kernel irqchips.
>>>>>
>>>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>>>>
>>>>
>>>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>>>>
>>>> Although it's a little odd to have From: Jan without a SoB...
>>>
>>> Agree, Jan can you ACK?
>>
>> I wasn't able to join the call yesterday: Is there a removal schedule
>> associated with those switches? Also, why pushing things upstream, even
>> when only for one release, that have been loudly deprecated for a while
>> in qemu-kvm? Some switches are lacking deprecated warnings on the
>> console, and -no-kvm is missing completely. I tend to focus on patch 1 &
>> 5, dropping the rest - based on relevance for production use.
> 
> The distros need to keep these flags to do the switch.

Why? Should be documented in commit log.

>  I see no point
> in deprecating them since they're trivially easy to maintain.

Given the level of cr** we already have in the command line, they are
kind of noise, yes. But even then, these patches are not consistent as
pointed out above.

Also, they should not be documented to avoid being spread. That's what
we did with other deprecated switches in QEMU.

Jan



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Anthony Liguori]

Jan Kiszka <jan.kiszka@web.de> writes:

> On 2012-10-03 19:16, Anthony Liguori wrote:
>> Jan Kiszka <jan.kiszka@web.de> writes:
>> 
>>> On 2012-10-03 17:03, Marcelo Tosatti wrote:
>>>> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
>>>>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>>>>>
>>>>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>>>>>>
>>>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>>>>     
>>>>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
>>>>>> already to configure the specific defaults: kvm enabled on, just like
>>>>>> in-kernel irqchips.
>>>>>>
>>>>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>>>>>
>>>>>
>>>>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>>>>>
>>>>> Although it's a little odd to have From: Jan without a SoB...
>>>>
>>>> Agree, Jan can you ACK?
>>>
>>> I wasn't able to join the call yesterday: Is there a removal schedule
>>> associated with those switches? Also, why pushing things upstream, even
>>> when only for one release, that have been loudly deprecated for a while
>>> in qemu-kvm? Some switches are lacking deprecated warnings on the
>>> console, and -no-kvm is missing completely. I tend to focus on patch 1 &
>>> 5, dropping the rest - based on relevance for production use.
>> 
>> The distros need to keep these flags to do the switch.
>
> Why? Should be documented in commit log.
>
>>  I see no point
>> in deprecating them since they're trivially easy to maintain.
>
> Given the level of cr** we already have in the command line, they are
> kind of noise, yes. But even then, these patches are not consistent as
> pointed out above.
>
> Also, they should not be documented to avoid being spread. That's what
> we did with other deprecated switches in QEMU.

The patchset isn't checkpatch clean so I'll fix that, remove the docs,
and send a new version tomorrow along with the machine changes.

Regards,

Anthony Liguori

>
> Jan

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Marcelo Tosatti]

On Wed, Oct 03, 2012 at 07:24:48PM +0200, Jan Kiszka wrote:
> On 2012-10-03 19:16, Anthony Liguori wrote:
> > Jan Kiszka <jan.kiszka@web.de> writes:
> > 
> >> On 2012-10-03 17:03, Marcelo Tosatti wrote:
> >>> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
> >>>> Marcelo Tosatti <mtosatti@redhat.com> writes:
> >>>>
> >>>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
> >>>>>
> >>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
> >>>>>     
> >>>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
> >>>>> already to configure the specific defaults: kvm enabled on, just like
> >>>>> in-kernel irqchips.
> >>>>>
> >>>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> >>>>
> >>>>
> >>>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
> >>>>
> >>>> Although it's a little odd to have From: Jan without a SoB...
> >>>
> >>> Agree, Jan can you ACK?
> >>
> >> I wasn't able to join the call yesterday: Is there a removal schedule
> >> associated with those switches? Also, why pushing things upstream, even
> >> when only for one release, that have been loudly deprecated for a while
> >> in qemu-kvm? Some switches are lacking deprecated warnings on the
> >> console, and -no-kvm is missing completely. I tend to focus on patch 1 &
> >> 5, dropping the rest - based on relevance for production use.
> > 
> > The distros need to keep these flags to do the switch.
> 
> Why? Should be documented in commit log.
> 
> >  I see no point
> > in deprecating them since they're trivially easy to maintain.
> 
> Given the level of cr** we already have in the command line, they are
> kind of noise, yes. But even then, these patches are not consistent as
> pointed out above.
> 
> Also, they should not be documented to avoid being spread. That's what
> we did with other deprecated switches in QEMU.
> 
> Jan

Jan,

You're comments to the patch are:

- No documentation.
- Expiration date.
- Changelog explaining what?? (didnt get that). Perhaps better changelog
  in general?

Please help me understand.

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 2604 bytes --]

On 2012-10-03 20:26, Marcelo Tosatti wrote:
> On Wed, Oct 03, 2012 at 07:24:48PM +0200, Jan Kiszka wrote:
>> On 2012-10-03 19:16, Anthony Liguori wrote:
>>> Jan Kiszka <jan.kiszka@web.de> writes:
>>>
>>>> On 2012-10-03 17:03, Marcelo Tosatti wrote:
>>>>> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
>>>>>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>>>>>>
>>>>>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>>>>>>>
>>>>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>>>>>     
>>>>>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
>>>>>>> already to configure the specific defaults: kvm enabled on, just like
>>>>>>> in-kernel irqchips.
>>>>>>>
>>>>>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>>>>>>
>>>>>>
>>>>>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>>>>>>
>>>>>> Although it's a little odd to have From: Jan without a SoB...
>>>>>
>>>>> Agree, Jan can you ACK?
>>>>
>>>> I wasn't able to join the call yesterday: Is there a removal schedule
>>>> associated with those switches? Also, why pushing things upstream, even
>>>> when only for one release, that have been loudly deprecated for a while
>>>> in qemu-kvm? Some switches are lacking deprecated warnings on the
>>>> console, and -no-kvm is missing completely. I tend to focus on patch 1 &
>>>> 5, dropping the rest - based on relevance for production use.
>>>
>>> The distros need to keep these flags to do the switch.
>>
>> Why? Should be documented in commit log.
>>
>>>  I see no point
>>> in deprecating them since they're trivially easy to maintain.
>>
>> Given the level of cr** we already have in the command line, they are
>> kind of noise, yes. But even then, these patches are not consistent as
>> pointed out above.
>>
>> Also, they should not be documented to avoid being spread. That's what
>> we did with other deprecated switches in QEMU.
>>
>> Jan
> 
> Jan,
> 
> You're comments to the patch are:
> 
> - No documentation.

See e.g. how -M is handled in qemu-options.hx.

> - Expiration date.

Anthony said "forever", but I think we should remove all those that
issue deprecation warnings after 1-2 years.

> - Changelog explaining what?? (didnt get that). Perhaps better changelog
>   in general?

I'm still failing to understand who could depend on -no-kvm-irqchip or
-no-kvm-pit. And I don't understand why -no-kvm was not included. Soe
the reasons for include -X should be provided. Also check your patch
subjects again, at least one was wrong.

Jan



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Anthony Liguori]

Jan Kiszka <jan.kiszka@web.de> writes:

> On 2012-10-03 20:26, Marcelo Tosatti wrote:
>> On Wed, Oct 03, 2012 at 07:24:48PM +0200, Jan Kiszka wrote:
>>> On 2012-10-03 19:16, Anthony Liguori wrote:
>>>> Jan Kiszka <jan.kiszka@web.de> writes:
>>>>
>>>>> On 2012-10-03 17:03, Marcelo Tosatti wrote:
>>>>>> On Wed, Oct 03, 2012 at 09:40:17AM -0500, Anthony Liguori wrote:
>>>>>>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>>>>>>>
>>>>>>>> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
>>>>>>>>
>>>>>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>>>>>>     
>>>>>>>> Upstream is moving towards this mechanism, so start using it in qemu-kvm
>>>>>>>> already to configure the specific defaults: kvm enabled on, just like
>>>>>>>> in-kernel irqchips.
>>>>>>>>
>>>>>>>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>>>>>>>
>>>>>>>
>>>>>>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>>>>>>>
>>>>>>> Although it's a little odd to have From: Jan without a SoB...
>>>>>>
>>>>>> Agree, Jan can you ACK?
>>>>>
>>>>> I wasn't able to join the call yesterday: Is there a removal schedule
>>>>> associated with those switches? Also, why pushing things upstream, even
>>>>> when only for one release, that have been loudly deprecated for a while
>>>>> in qemu-kvm? Some switches are lacking deprecated warnings on the
>>>>> console, and -no-kvm is missing completely. I tend to focus on patch 1 &
>>>>> 5, dropping the rest - based on relevance for production use.
>>>>
>>>> The distros need to keep these flags to do the switch.
>>>
>>> Why? Should be documented in commit log.
>>>
>>>>  I see no point
>>>> in deprecating them since they're trivially easy to maintain.
>>>
>>> Given the level of cr** we already have in the command line, they are
>>> kind of noise, yes. But even then, these patches are not consistent as
>>> pointed out above.
>>>
>>> Also, they should not be documented to avoid being spread. That's what
>>> we did with other deprecated switches in QEMU.
>>>
>>> Jan
>> 
>> Jan,
>> 
>> You're comments to the patch are:
>> 
>> - No documentation.
>
> See e.g. how -M is handled in qemu-options.hx.
>
>> - Expiration date.
>
> Anthony said "forever", but I think we should remove all those that
> issue deprecation warnings after 1-2 years.
>
>> - Changelog explaining what?? (didnt get that). Perhaps better changelog
>>   in general?
>
> I'm still failing to understand who could depend on -no-kvm-irqchip or
> -no-kvm-pit. And I don't understand why -no-kvm was not included. Soe
> the reasons for include -X should be provided. Also check your patch
> subjects again, at least one was wrong.

-no-kvm should be included too.

I just ran across a user that was injecting '-no-kvm-irqchip' in their
libvirt XML via a custom attribute.  It turned out it was to work around
broken MSI support in their funky guest they were running.  It was the
wrong solution to the problem but they were doing it regardless.

The point is, there are users in the wild using these options.  There's
no reason to remove them if they are trivial to maintain (and they are
in their current form).

Regards,

Anthony Liguori

>
> Jan

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Jan Kiszka]

On 2012-10-04 16:21, Anthony Liguori wrote:
> -no-kvm should be included too.

Reminds me that we still need to agree on the final default accel strategy.

> 
> I just ran across a user that was injecting '-no-kvm-irqchip' in their
> libvirt XML via a custom attribute.  It turned out it was to work around
> broken MSI support in their funky guest they were running.  It was the
> wrong solution to the problem but they were doing it regardless.
> 
> The point is, there are users in the wild using these options.  There's
> no reason to remove them if they are trivial to maintain (and they are
> in their current form).

So let's define a consistent policy for them all:
 - warn on the command line on use
 - avoid adding them to the help or other user documentation
 - keep them until we rework the whole command line

Jan

-- 
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Andreas Färber]

Am 04.10.2012 16:30, schrieb Jan Kiszka:
> On 2012-10-04 16:21, Anthony Liguori wrote:
>> -no-kvm should be included too.
> 
> Reminds me that we still need to agree on the final default accel strategy.
> 
>>
>> I just ran across a user that was injecting '-no-kvm-irqchip' in their
>> libvirt XML via a custom attribute.  It turned out it was to work around
>> broken MSI support in their funky guest they were running.  It was the
>> wrong solution to the problem but they were doing it regardless.
>>
>> The point is, there are users in the wild using these options.  There's
>> no reason to remove them if they are trivial to maintain (and they are
>> in their current form).
> 
> So let's define a consistent policy for them all:
>  - warn on the command line on use

>  - avoid adding them to the help or other user documentation

That's dangerous - at some point someone will notice and propose a patch
documenting them and the reviewers may have forgotten by then why it was
not documented in the first place. Better clearly document them in help
output as "DEPRECATED, to be removed in future versions" or so.

Andreas

>  - keep them until we rework the whole command line
> 
> Jan
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Jan Kiszka]

On 2012-10-04 17:36, Andreas Färber wrote:
> Am 04.10.2012 16:30, schrieb Jan Kiszka:
>> On 2012-10-04 16:21, Anthony Liguori wrote:
>>> -no-kvm should be included too.
>>
>> Reminds me that we still need to agree on the final default accel strategy.
>>
>>>
>>> I just ran across a user that was injecting '-no-kvm-irqchip' in their
>>> libvirt XML via a custom attribute.  It turned out it was to work around
>>> broken MSI support in their funky guest they were running.  It was the
>>> wrong solution to the problem but they were doing it regardless.
>>>
>>> The point is, there are users in the wild using these options.  There's
>>> no reason to remove them if they are trivial to maintain (and they are
>>> in their current form).
>>
>> So let's define a consistent policy for them all:
>>  - warn on the command line on use
> 
>>  - avoid adding them to the help or other user documentation
> 
> That's dangerous - at some point someone will notice and propose a patch
> documenting them and the reviewers may have forgotten by then why it was
> not documented in the first place. Better clearly document them in help
> output as "DEPRECATED, to be removed in future versions" or so.

-M is marked as deprecated in the file that you would have to mess up.

Jan

-- 
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Andreas Färber]

Am 04.10.2012 18:04, schrieb Jan Kiszka:
> On 2012-10-04 17:36, Andreas Färber wrote:
>> Am 04.10.2012 16:30, schrieb Jan Kiszka:
>>> On 2012-10-04 16:21, Anthony Liguori wrote:
>>>  - avoid adding them to the help or other user documentation
>>
>> That's dangerous - at some point someone will notice and propose a patch
>> documenting them and the reviewers may have forgotten by then why it was
>> not documented in the first place. Better clearly document them in help
>> output as "DEPRECATED, to be removed in future versions" or so.
> 
> -M is marked as deprecated in the file that you would have to mess up.

If it's not within +/- 3 lines and goes through qemu-trivial then that
point is moot. Don't see how deprecation of -no-kvm-irqchip et al. is
related to -M being deprecated either way.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Jan Kiszka]

On 2012-10-04 18:13, Andreas Färber wrote:
> Am 04.10.2012 18:04, schrieb Jan Kiszka:
>> On 2012-10-04 17:36, Andreas Färber wrote:
>>> Am 04.10.2012 16:30, schrieb Jan Kiszka:
>>>> On 2012-10-04 16:21, Anthony Liguori wrote:
>>>>  - avoid adding them to the help or other user documentation
>>>
>>> That's dangerous - at some point someone will notice and propose a patch
>>> documenting them and the reviewers may have forgotten by then why it was
>>> not documented in the first place. Better clearly document them in help
>>> output as "DEPRECATED, to be removed in future versions" or so.
>>
>> -M is marked as deprecated in the file that you would have to mess up.
> 
> If it's not within +/- 3 lines and goes through qemu-trivial then that
> point is moot. Don't see how deprecation of -no-kvm-irqchip et al. is
> related to -M being deprecated either way.

I'm only citing an example that these switches should follow:

[qemu-options.hx]
HXCOMM Deprecated by -machine
DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)

Jan

-- 
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Marcelo Tosatti]

On Thu, Oct 04, 2012 at 05:36:38PM +0200, Andreas Färber wrote:
> Am 04.10.2012 16:30, schrieb Jan Kiszka:
> > On 2012-10-04 16:21, Anthony Liguori wrote:
> >> -no-kvm should be included too.
> > 
> > Reminds me that we still need to agree on the final default accel strategy.
> > 
> >>
> >> I just ran across a user that was injecting '-no-kvm-irqchip' in their
> >> libvirt XML via a custom attribute.  It turned out it was to work around
> >> broken MSI support in their funky guest they were running.  It was the
> >> wrong solution to the problem but they were doing it regardless.
> >>
> >> The point is, there are users in the wild using these options.  There's
> >> no reason to remove them if they are trivial to maintain (and they are
> >> in their current form).
> > 
> > So let's define a consistent policy for them all:
> >  - warn on the command line on use
> 
> >  - avoid adding them to the help or other user documentation
> 
> That's dangerous - at some point someone will notice and propose a patch
> documenting them and the reviewers may have forgotten by then why it was
> not documented in the first place. Better clearly document them in help
> output as "DEPRECATED, to be removed in future versions" or so.

Adding the policy to docs/qemukvm-compat-commands-policy.txt should workaround
that problem.

And a friendly text on the announce e-mail.

> Andreas
> 
> >  - keep them until we rework the whole command line
> > 
> > Jan
> > 

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Marcelo Tosatti]

On Thu, Oct 04, 2012 at 04:30:26PM +0200, Jan Kiszka wrote:
> On 2012-10-04 16:21, Anthony Liguori wrote:
> > -no-kvm should be included too.
> 
> Reminds me that we still need to agree on the final default accel strategy.

Default accel=kvm for x86_64 targets, no fallback.

Markus's argument is pretty convincing to me:

"Friendly perhaps, generating an infinite series of questions "why is my
guest slow as molasses?" certainly.

And for each instance of the question, there's an unknown number of
users who give QEMU a quick try, screw up KVM unknowingly, observe the
glacial speed, and conclude it's crap."

> > I just ran across a user that was injecting '-no-kvm-irqchip' in their
> > libvirt XML via a custom attribute.  It turned out it was to work around
> > broken MSI support in their funky guest they were running.  It was the
> > wrong solution to the problem but they were doing it regardless.
> > 
> > The point is, there are users in the wild using these options.  There's
> > no reason to remove them if they are trivial to maintain (and they are
> > in their current form).
> 
> So let's define a consistent policy for them all:
>  - warn on the command line on use
>  - avoid adding them to the help or other user documentation
>  - keep them until we rework the whole command line
> 
> Jan
> 
> -- 
> Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
> Corporate Competence Center Embedded Linux

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> On Thu, Oct 04, 2012 at 04:30:26PM +0200, Jan Kiszka wrote:
>> On 2012-10-04 16:21, Anthony Liguori wrote:
>> > -no-kvm should be included too.
>> 
>> Reminds me that we still need to agree on the final default accel strategy.
>
> Default accel=kvm for x86_64 targets, no fallback.

Ack.

BTW, if you want to override this, you can just do:

[machine]
accel=kvm:tcg

In /etc/qemu/target-i386.conf

So the distros can do whatever they like in their packages.

We should instruct users how to do this in an error message too in case
they want to permanently disable kvm because they don't have appropriate
hardware suport.

Regards,

Anthony Liguori

> Markus's argument is pretty convincing to me:
>
> "Friendly perhaps, generating an infinite series of questions "why is my
> guest slow as molasses?" certainly.
>
> And for each instance of the question, there's an unknown number of
> users who give QEMU a quick try, screw up KVM unknowingly, observe the
> glacial speed, and conclude it's crap."
>
>> > I just ran across a user that was injecting '-no-kvm-irqchip' in their
>> > libvirt XML via a custom attribute.  It turned out it was to work around
>> > broken MSI support in their funky guest they were running.  It was the
>> > wrong solution to the problem but they were doing it regardless.
>> > 
>> > The point is, there are users in the wild using these options.  There's
>> > no reason to remove them if they are trivial to maintain (and they are
>> > in their current form).
>> 
>> So let's define a consistent policy for them all:
>>  - warn on the command line on use
>>  - avoid adding them to the help or other user documentation
>>  - keep them until we rework the whole command line
>> 
>> Jan
>> 
>> -- 
>> Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
>> Corporate Competence Center Embedded Linux
> --
> 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

Re: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip

[Aurelien Jarno]

On Wed, Oct 03, 2012 at 07:52:57AM -0300, Marcelo Tosatti wrote:
> Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.
> 
> From: Jan Kiszka <jan.kiszka@siemens.com>
>     
> Upstream is moving towards this mechanism, so start using it in qemu-kvm
> already to configure the specific defaults: kvm enabled on, just like
> in-kernel irqchips.
> 
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> 
> Index: qemu-compat-kvm/vl.c
> ===================================================================
> --- qemu-compat-kvm.orig/vl.c
> +++ qemu-compat-kvm/vl.c
> @@ -3061,6 +3061,12 @@ int main(int argc, char **argv, char **e
>                      machine = machine_parse(optarg);
>                  }
>                  break;
> +            case QEMU_OPTION_no_kvm_irqchip: {
> +                olist = qemu_find_opts("machine");
> +                qemu_opts_parse(olist, "kernel_irqchip=off", 0);
> +                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
> @@ -2838,6 +2838,10 @@ STEXI
>  Enable FIPS 140-2 compliance mode.
>  ETEXI
>  
> +DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
> +    "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
> +    QEMU_ARCH_I386)
> +
>  HXCOMM This is the last statement. Insert new options before this line!
>  STEXI
>  @end table
> 

As far as I understand, this option was not in QEMU, because this syntax
is considered as deprecated. Can we also add an output a warning message
in that case?

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

[Qemu-devel] [patch 3/6] Use machine options to emulate -no-kvm-pit

[Marcelo Tosatti]

[-- Attachment #1: qemukvm-nokvmpit --]
[-- Type: text/plain, Size: 1450 bytes --]

Commit e81dda195556e72f8cd294998296c1051aab30a8 from qemu-kvm.git.

From: Jan Kiszka <jan.kiszka@siemens.com>

Leave the related command line option in place, just
issuing a warning that it has no function anymore.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu-compat-kvm/vl.c
===================================================================
--- qemu-compat-kvm.orig/vl.c
+++ qemu-compat-kvm/vl.c
@@ -3066,7 +3066,11 @@ int main(int argc, char **argv, char **e
                 qemu_opts_parse(olist, "kernel_irqchip=off", 0);
                 break;
             }
-
+            case QEMU_OPTION_no_kvm_pit: {
+                fprintf(stderr, "Warning: KVM PIT can no longer be disabled "
+                        "separately.\n");
+                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
@@ -2841,6 +2841,10 @@ ETEXI
 DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
     "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
     QEMU_ARCH_I386)
+DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit,
+    "-no-kvm-pit     disable KVM kernel mode PIT\n",
+    QEMU_ARCH_I386)
+
 
 HXCOMM This is the last statement. Insert new options before this line!
 STEXI

Re: [Qemu-devel] [patch 3/6] Use machine options to emulate -no-kvm-pit

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> Commit e81dda195556e72f8cd294998296c1051aab30a8 from qemu-kvm.git.
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Leave the related command line option in place, just
> issuing a warning that it has no function anymore.
>
> 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
> @@ -3066,7 +3066,11 @@ int main(int argc, char **argv, char **e
>                  qemu_opts_parse(olist, "kernel_irqchip=off", 0);
>                  break;
>              }
> -
> +            case QEMU_OPTION_no_kvm_pit: {
> +                fprintf(stderr, "Warning: KVM PIT can no longer be disabled "
> +                        "separately.\n");
> +                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
> @@ -2841,6 +2841,10 @@ ETEXI
>  DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
>      "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
>      QEMU_ARCH_I386)
> +DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit,
> +    "-no-kvm-pit     disable KVM kernel mode PIT\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

[Qemu-devel] [patch 4/6] Use global properties to emulate -no-kvm-pit-reinjection

[Marcelo Tosatti]

[-- Attachment #1: qemukvm-nokvmpit-reinjection --]
[-- Type: text/plain, Size: 1916 bytes --]

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>

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

Re: [Qemu-devel] [patch 4/6] Use global properties to emulate -no-kvm-pit-reinjection

[Anthony Liguori]

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

[Qemu-devel] [patch 5/6] Emulate qemu-kvms drive parameter boot=on|off

[Marcelo Tosatti]

[-- Attachment #1: qemukvm-commandline-boot-option --]
[-- Type: text/plain, Size: 1621 bytes --]

Commit 841280b6c224ea2c6edc2f5afc2add513c85181d from qemu-kvm.git.

From: Jan Kiszka <jan.kiszka@siemens.com>

We do not want to maintain this option forever. It will be removed after
a grace period of a few releases. So warn the user that this option has
no effect and will become invalid soon.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu-compat-kvm/blockdev.c
===================================================================
--- qemu-compat-kvm.orig/blockdev.c
+++ qemu-compat-kvm/blockdev.c
@@ -432,6 +432,12 @@ DriveInfo *drive_init(QemuOpts *opts, in
         return NULL;
     }
 
+    if (qemu_opt_get(opts, "boot") != NULL) {
+        fprintf(stderr, "qemu-kvm: boot=on|off is deprecated and will be "
+                "ignored. Future versions will reject this parameter. Please "
+                "update your scripts.\n");
+    }
+
     on_write_error = BLOCK_ERR_STOP_ENOSPC;
     if ((buf = qemu_opt_get(opts, "werror")) != NULL) {
         if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {
Index: qemu-compat-kvm/qemu-config.c
===================================================================
--- qemu-compat-kvm.orig/qemu-config.c
+++ qemu-compat-kvm/qemu-config.c
@@ -114,6 +114,10 @@ static QemuOptsList qemu_drive_opts = {
             .name = "copy-on-read",
             .type = QEMU_OPT_BOOL,
             .help = "copy read data from backing file into image file",
+        },{
+            .name = "boot",
+            .type = QEMU_OPT_BOOL,
+            .help = "(deprecated, ignored)",
         },
         { /* end of list */ }
     },

Re: [Qemu-devel] [patch 5/6] Emulate qemu-kvms drive parameter boot=on|off

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> Commit 841280b6c224ea2c6edc2f5afc2add513c85181d from qemu-kvm.git.
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> We do not want to maintain this option forever. It will be removed after
> a grace period of a few releases. So warn the user that this option has
> no effect and will become invalid soon.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

>
> Index: qemu-compat-kvm/blockdev.c
> ===================================================================
> --- qemu-compat-kvm.orig/blockdev.c
> +++ qemu-compat-kvm/blockdev.c
> @@ -432,6 +432,12 @@ DriveInfo *drive_init(QemuOpts *opts, in
>          return NULL;
>      }
>  
> +    if (qemu_opt_get(opts, "boot") != NULL) {
> +        fprintf(stderr, "qemu-kvm: boot=on|off is deprecated and will be "
> +                "ignored. Future versions will reject this parameter. Please "
> +                "update your scripts.\n");
> +    }
> +
>      on_write_error = BLOCK_ERR_STOP_ENOSPC;
>      if ((buf = qemu_opt_get(opts, "werror")) != NULL) {
>          if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {
> Index: qemu-compat-kvm/qemu-config.c
> ===================================================================
> --- qemu-compat-kvm.orig/qemu-config.c
> +++ qemu-compat-kvm/qemu-config.c
> @@ -114,6 +114,10 @@ static QemuOptsList qemu_drive_opts = {
>              .name = "copy-on-read",
>              .type = QEMU_OPT_BOOL,
>              .help = "copy read data from backing file into image file",
> +        },{
> +            .name = "boot",
> +            .type = QEMU_OPT_BOOL,
> +            .help = "(deprecated, ignored)",
>          },
>          { /* end of list */ }
>      },
>
>
> --
> 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

[Qemu-devel] [patch 6/6] Emulate qemu-kvms -tdf option

[Marcelo Tosatti]

[-- Attachment #1: qemukvm-commandline-opt-tdf --]
[-- Type: text/plain, Size: 1370 bytes --]

Commit d527b774878defc27f317cdde19b5c54fd0d5666 from qemu-kvm.git.

From: Jan Kiszka <jan.kiszka@siemens.com>

Add a warning that there is no effect anymore.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu-compat-kvm/vl.c
===================================================================
--- qemu-compat-kvm.orig/vl.c
+++ qemu-compat-kvm/vl.c
@@ -3169,6 +3169,10 @@ int main(int argc, char **argv, char **e
             case QEMU_OPTION_semihosting:
                 semihosting_enabled = 1;
                 break;
+            case QEMU_OPTION_tdf:
+                fprintf(stderr, "Warning: user space PIT time drift fix "
+                                "is no longer supported.\n");
+                break;
             case QEMU_OPTION_name:
                 qemu_name = g_strdup(optarg);
 		 {
Index: qemu-compat-kvm/qemu-options.hx
===================================================================
--- qemu-compat-kvm.orig/qemu-options.hx
+++ qemu-compat-kvm/qemu-options.hx
@@ -2849,6 +2849,10 @@ DEF("no-kvm-pit-reinjection", 0, QEMU_OP
     "                disable KVM kernel mode PIT interrupt reinjection\n",
     QEMU_ARCH_I386)
 
+DEF("tdf", 0, QEMU_OPTION_tdf,
+    "-tdf            time drift fix (deprecated)\n",
+    QEMU_ARCH_ALL)
+
 HXCOMM This is the last statement. Insert new options before this line!
 STEXI
 @end table

Re: [Qemu-devel] [patch 6/6] Emulate qemu-kvms -tdf option

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> Commit d527b774878defc27f317cdde19b5c54fd0d5666 from qemu-kvm.git.
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Add a warning that there is no effect anymore.
>
> 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
> @@ -3169,6 +3169,10 @@ int main(int argc, char **argv, char **e
>              case QEMU_OPTION_semihosting:
>                  semihosting_enabled = 1;
>                  break;
> +            case QEMU_OPTION_tdf:
> +                fprintf(stderr, "Warning: user space PIT time drift fix "
> +                                "is no longer supported.\n");
> +                break;
>              case QEMU_OPTION_name:
>                  qemu_name = g_strdup(optarg);
>  		 {
> Index: qemu-compat-kvm/qemu-options.hx
> ===================================================================
> --- qemu-compat-kvm.orig/qemu-options.hx
> +++ qemu-compat-kvm/qemu-options.hx
> @@ -2849,6 +2849,10 @@ DEF("no-kvm-pit-reinjection", 0, QEMU_OP
>      "                disable KVM kernel mode PIT interrupt reinjection\n",
>      QEMU_ARCH_I386)
>  
> +DEF("tdf", 0, QEMU_OPTION_tdf,
> +    "-tdf            time drift fix (deprecated)\n",
> +    QEMU_ARCH_ALL)
> +
>  HXCOMM This is the last statement. Insert new options before this line!
>  STEXI
>  @end table
>
>
> --
> 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

Re: [Qemu-devel] [patch 0/6] qemu-kvm compat

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> As discussed on yesterdays qemu call, follows qemu-kvm compat patches 
> for qemu:
>
>     - command line compatibility
>     - allow configurable ram size for cirrus 

Whole thing looks good.  I'll apply it directly to get it into qemu.git
faster.

Thanks.

Regards,

Anthony Liguori

>
>
> --
> 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

Re: [Qemu-devel] [patch 0/6] qemu-kvm compat

[Marcelo Tosatti]

On Wed, Oct 03, 2012 at 09:45:07AM -0500, Anthony Liguori wrote:
> Marcelo Tosatti <mtosatti@redhat.com> writes:
> 
> > As discussed on yesterdays qemu call, follows qemu-kvm compat patches 
> > for qemu:
> >
> >     - command line compatibility
> >     - allow configurable ram size for cirrus 
> 
> Whole thing looks good.  I'll apply it directly to get it into qemu.git
> faster.

Great. I'll test migration later today.

You will take care of the default options matching qemu-kvm, 
as agreed, yes? Via machine options?

Re: [Qemu-devel] [patch 0/6] qemu-kvm compat

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> On Wed, Oct 03, 2012 at 09:45:07AM -0500, Anthony Liguori wrote:
>> Marcelo Tosatti <mtosatti@redhat.com> writes:
>> 
>> > As discussed on yesterdays qemu call, follows qemu-kvm compat patches 
>> > for qemu:
>> >
>> >     - command line compatibility
>> >     - allow configurable ram size for cirrus 
>> 
>> Whole thing looks good.  I'll apply it directly to get it into qemu.git
>> faster.
>
> Great. I'll test migration later today.
>
> You will take care of the default options matching qemu-kvm, 
> as agreed, yes? Via machine options?

Yup.

Regards,

Anthony Liguori