[Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Alon Levy]

The default is still 3, and I didn't change older machine types.

Signed-off-by: Alon Levy <alevy@redhat.com>
---
Is there a better way then copy pasting this to the older pc types to get
the revision == 2 for them as well?

 hw/pc_piix.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 27ea570..970f43c 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -311,6 +311,18 @@ static QEMUMachine pc_machine_v0_14 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        {
+            .driver   = "qxl",
+            .property = "revision",
+            .value    = stringify(2),
+        },{
+            .driver   = "qxl-vga",
+            .property = "revision",
+            .value    = stringify(2),
+        },
+        { /* end of list */ }
+    },
 };
 
 static QEMUMachine pc_machine_v0_13 = {
-- 
1.7.7.3

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Gerd Hoffmann]

On 11/13/11 14:27, Alon Levy wrote:
> The default is still 3, and I didn't change older machine types.

Looks good to me.

> Signed-off-by: Alon Levy <alevy@redhat.com>
> ---
> Is there a better way then copy pasting this to the older pc types to get
> the revision == 2 for them as well?

Unfortunaly not, although we probably should have one to make compat
props less error prone ...

Not an issue in that case though as 0.14 was the first qemu version with
spice.

cheers,
  Gerd

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Alon Levy]

On Mon, Nov 14, 2011 at 11:40:57AM +0100, Gerd Hoffmann wrote:
> On 11/13/11 14:27, Alon Levy wrote:
> > The default is still 3, and I didn't change older machine types.
> 
> Looks good to me.
> 

ok, so do you want another email with subject PATCH or can I consider
this in the queue?

> > Signed-off-by: Alon Levy <alevy@redhat.com>
> > ---
> > Is there a better way then copy pasting this to the older pc types to get
> > the revision == 2 for them as well?
> 
> Unfortunaly not, although we probably should have one to make compat
> props less error prone ...
> 
> Not an issue in that case though as 0.14 was the first qemu version with
> spice.
> 
> cheers,
>   Gerd
> 
> 

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Gerd Hoffmann]

On 11/14/11 12:44, Alon Levy wrote:
> On Mon, Nov 14, 2011 at 11:40:57AM +0100, Gerd Hoffmann wrote:
>> On 11/13/11 14:27, Alon Levy wrote:
>>> The default is still 3, and I didn't change older machine types.
>>
>> Looks good to me.
>>
> 
> ok, so do you want another email with subject PATCH or can I consider
> this in the queue?

Antony, can you apply this directly or do you wanna have a
single-patch-pull-request instead?

thanks,
  Gerd

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Anthony Liguori]

On 11/14/2011 09:55 AM, Gerd Hoffmann wrote:
> On 11/14/11 12:44, Alon Levy wrote:
>> On Mon, Nov 14, 2011 at 11:40:57AM +0100, Gerd Hoffmann wrote:
>>> On 11/13/11 14:27, Alon Levy wrote:
>>>> The default is still 3, and I didn't change older machine types.
>>>
>>> Looks good to me.
>>>
>>
>> ok, so do you want another email with subject PATCH or can I consider
>> this in the queue?
>
> Antony, can you apply this directly or do you wanna have a
> single-patch-pull-request instead?

Yes, I'll apply directly.

Regards,

Anthony Liguori

>
> thanks,
>    Gerd
>
>

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Avi Kivity]

On 11/14/2011 06:07 PM, Anthony Liguori wrote:
>> Antony, can you apply this directly or do you wanna have a
>> single-patch-pull-request instead?
>
>
> Yes, I'll apply directly.

Does stable-0.15 need it too?

-- 
error compiling committee.c: too many arguments to function

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Anthony Liguori]

On 11/14/2011 11:45 AM, Avi Kivity wrote:
> On 11/14/2011 06:07 PM, Anthony Liguori wrote:
>>> Antony, can you apply this directly or do you wanna have a
>>> single-patch-pull-request instead?
>>
>>
>> Yes, I'll apply directly.
>
> Does stable-0.15 need it too?

You mean to set the revision to 2 for 0.14, right?  Not to set the revision to 2 
for 0.15?

Regards,

Anthony Liguori

>

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Avi Kivity]

On 11/14/2011 07:48 PM, Anthony Liguori wrote:
> On 11/14/2011 11:45 AM, Avi Kivity wrote:
>> On 11/14/2011 06:07 PM, Anthony Liguori wrote:
>>>> Antony, can you apply this directly or do you wanna have a
>>>> single-patch-pull-request instead?
>>>
>>>
>>> Yes, I'll apply directly.
>>
>> Does stable-0.15 need it too?
>
> You mean to set the revision to 2 for 0.14, right?  Not to set the
> revision to 2 for 0.15?
>

I mean, change stable-0.15 so that if it is invoked with -M 0.14, you
get a rev 2 qxl device.

The Fedora 16 regression which triggered this was running 0.15, I
imagine (but it could be running virt-preview, or something, so not sure).

-- 
error compiling committee.c: too many arguments to function

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Gerd Hoffmann]

  Hi,

> I mean, change stable-0.15 so that if it is invoked with -M 0.14, you
> get a rev 2 qxl device.

0.15 has qxl rev 2 too, 1.0 got rev 3.  No need to do anything for
-stable.  Also 0.15 didn't got its own machine type, so the pc-0.14
compat property (master branch) covers both 0.14 and 0.15.  Everything
is fine.

> The Fedora 16 regression which triggered this was running 0.15, I
> imagine (but it could be running virt-preview, or something, so not sure).

Must have been due to backports then, or running a master snapshot.

cheers,
  Gerd

Re: [Qemu-devel] [RFC 1.0] pc_piix: set qxl revision to 2 for pc-0.14

[Anthony Liguori]

On 11/13/2011 07:27 AM, Alon Levy wrote:
> The default is still 3, and I didn't change older machine types.
>
> Signed-off-by: Alon Levy<alevy@redhat.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
> Is there a better way then copy pasting this to the older pc types to get
> the revision == 2 for them as well?
>
>   hw/pc_piix.c |   12 ++++++++++++
>   1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 27ea570..970f43c 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -311,6 +311,18 @@ static QEMUMachine pc_machine_v0_14 = {
>       .desc = "Standard PC",
>       .init = pc_init_pci,
>       .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        {
> +            .driver   = "qxl",
> +            .property = "revision",
> +            .value    = stringify(2),
> +        },{
> +            .driver   = "qxl-vga",
> +            .property = "revision",
> +            .value    = stringify(2),
> +        },
> +        { /* end of list */ }
> +    },
>   };
>
>   static QEMUMachine pc_machine_v0_13 = {