qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH 0/2] vga: demote cirrus
@ 2014-10-28  9:09 Gerd Hoffmann
  2014-10-28  9:09 ` [Qemu-devel] [PATCH 1/2] vga: add default display to machine class Gerd Hoffmann
                   ` (3 more replies)
  0 siblings, 4 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2014-10-28  9:09 UTC (permalink / raw)
  To: qemu-devel; +Cc: ajax, Gerd Hoffmann

  Hi,

Time to flip the default to stdvga.  Done for 2.2+ machine types only,
for obvious compatibility reasons.

https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/

Gerd Hoffmann (2):
  vga: add default display to machine class
  vga: flip qemu 2.2 pc machine types from cirrus to stdvga

 hw/i386/pc.c        | 1 +
 hw/i386/pc_piix.c   | 7 +++++--
 hw/i386/pc_q35.c    | 7 +++++--
 include/hw/boards.h | 2 ++
 vl.c                | 5 ++++-
 5 files changed, 17 insertions(+), 5 deletions(-)

-- 
1.8.3.1

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH 1/2] vga: add default display to machine class
  2014-10-28  9:09 [Qemu-devel] [PATCH 0/2] vga: demote cirrus Gerd Hoffmann
@ 2014-10-28  9:09 ` Gerd Hoffmann
  2014-10-28  9:09 ` [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga Gerd Hoffmann
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2014-10-28  9:09 UTC (permalink / raw)
  To: qemu-devel; +Cc: ajax, Gerd Hoffmann, Anthony Liguori, Michael S. Tsirkin

This allows machine classes to specify which display device they want
as default.  If unspecified the current behavior (try cirrus, failing
that try stdvga, failing that use no display) will be used.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i386/pc.c        | 1 +
 include/hw/boards.h | 2 ++
 vl.c                | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 61aba9f..ef37528 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1536,6 +1536,7 @@ static void pc_generic_machine_class_init(ObjectClass *oc, void *data)
     mc->is_default = qm->is_default;
     mc->default_machine_opts = qm->default_machine_opts;
     mc->default_boot_order = qm->default_boot_order;
+    mc->default_display = qm->default_display;
     mc->compat_props = qm->compat_props;
     mc->hw_version = qm->hw_version;
 }
diff --git a/include/hw/boards.h b/include/hw/boards.h
index e07c03f..2a09a10 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -39,6 +39,7 @@ struct QEMUMachine {
     int is_default;
     const char *default_machine_opts;
     const char *default_boot_order;
+    const char *default_display;
     GlobalProperty *compat_props;
     const char *hw_version;
 };
@@ -98,6 +99,7 @@ struct MachineClass {
     int is_default;
     const char *default_machine_opts;
     const char *default_boot_order;
+    const char *default_display;
     GlobalProperty *compat_props;
     const char *hw_version;
 
diff --git a/vl.c b/vl.c
index 50b97b4..fb5ab79 100644
--- a/vl.c
+++ b/vl.c
@@ -1437,6 +1437,7 @@ static void machine_class_init(ObjectClass *oc, void *data)
     mc->is_default = qm->is_default;
     mc->default_machine_opts = qm->default_machine_opts;
     mc->default_boot_order = qm->default_boot_order;
+    mc->default_display = qm->default_display;
     mc->compat_props = qm->compat_props;
     mc->hw_version = qm->hw_version;
 }
@@ -4193,7 +4194,9 @@ int main(int argc, char **argv, char **envp)
 
     /* If no default VGA is requested, the default is "none".  */
     if (default_vga) {
-        if (cirrus_vga_available()) {
+        if (machine_class->default_display) {
+            vga_model = machine_class->default_display;
+        } else if (cirrus_vga_available()) {
             vga_model = "cirrus";
         } else if (vga_available()) {
             vga_model = "std";
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-10-28  9:09 [Qemu-devel] [PATCH 0/2] vga: demote cirrus Gerd Hoffmann
  2014-10-28  9:09 ` [Qemu-devel] [PATCH 1/2] vga: add default display to machine class Gerd Hoffmann
@ 2014-10-28  9:09 ` Gerd Hoffmann
  2014-10-28 10:37   ` Dr. David Alan Gilbert
  2014-11-23 12:11   ` Michael S. Tsirkin
  2014-11-02 11:14 ` [Qemu-devel] [PATCH 0/2] vga: demote cirrus Michael S. Tsirkin
  2014-11-03 10:29 ` Michael S. Tsirkin
  3 siblings, 2 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2014-10-28  9:09 UTC (permalink / raw)
  To: qemu-devel; +Cc: ajax, Gerd Hoffmann, Anthony Liguori, Michael S. Tsirkin

This patch switches the default display from cirrus to vga
for the new (qemu 2.2+) machine types.  Old machines types
stay as-is for compatibility reasons.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i386/pc_piix.c | 7 +++++--
 hw/i386/pc_q35.c  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 91a20cb..8637246 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -456,7 +456,8 @@ static void pc_xen_hvm_init(MachineState *machine)
 
 #define PC_I440FX_2_2_MACHINE_OPTIONS                           \
     PC_I440FX_MACHINE_OPTIONS,                                  \
-    .default_machine_opts = "firmware=bios-256k.bin"
+    .default_machine_opts = "firmware=bios-256k.bin",           \
+    .default_display = "std"
 
 static QEMUMachine pc_i440fx_machine_v2_2 = {
     PC_I440FX_2_2_MACHINE_OPTIONS,
@@ -466,7 +467,9 @@ static QEMUMachine pc_i440fx_machine_v2_2 = {
     .is_default = 1,
 };
 
-#define PC_I440FX_2_1_MACHINE_OPTIONS PC_I440FX_2_2_MACHINE_OPTIONS
+#define PC_I440FX_2_1_MACHINE_OPTIONS                           \
+    PC_I440FX_MACHINE_OPTIONS,                                  \
+    .default_machine_opts = "firmware=bios-256k.bin"
 
 static QEMUMachine pc_i440fx_machine_v2_1 = {
     PC_I440FX_2_1_MACHINE_OPTIONS,
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index e225c6d..9fdb3fa 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -353,7 +353,8 @@ static void pc_q35_init_1_4(MachineState *machine)
 
 #define PC_Q35_2_2_MACHINE_OPTIONS                      \
     PC_Q35_MACHINE_OPTIONS,                             \
-    .default_machine_opts = "firmware=bios-256k.bin"
+    .default_machine_opts = "firmware=bios-256k.bin",   \
+    .default_display = "std"
 
 static QEMUMachine pc_q35_machine_v2_2 = {
     PC_Q35_2_2_MACHINE_OPTIONS,
@@ -362,7 +363,9 @@ static QEMUMachine pc_q35_machine_v2_2 = {
     .init = pc_q35_init,
 };
 
-#define PC_Q35_2_1_MACHINE_OPTIONS PC_Q35_2_2_MACHINE_OPTIONS
+#define PC_Q35_2_1_MACHINE_OPTIONS                      \
+    PC_Q35_MACHINE_OPTIONS,                             \
+    .default_machine_opts = "firmware=bios-256k.bin"
 
 static QEMUMachine pc_q35_machine_v2_1 = {
     PC_Q35_2_1_MACHINE_OPTIONS,
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-10-28  9:09 ` [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga Gerd Hoffmann
@ 2014-10-28 10:37   ` Dr. David Alan Gilbert
  2014-10-28 10:48     ` Gerd Hoffmann
  2014-11-23 12:11   ` Michael S. Tsirkin
  1 sibling, 1 reply; 15+ messages in thread
From: Dr. David Alan Gilbert @ 2014-10-28 10:37 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: ajax, qemu-devel, Anthony Liguori, Michael S. Tsirkin

* Gerd Hoffmann (kraxel@redhat.com) wrote:
> This patch switches the default display from cirrus to vga
> for the new (qemu 2.2+) machine types.  Old machines types
> stay as-is for compatibility reasons.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/i386/pc_piix.c | 7 +++++--
>  hw/i386/pc_q35.c  | 7 +++++--
>  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 91a20cb..8637246 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -456,7 +456,8 @@ static void pc_xen_hvm_init(MachineState *machine)
>  
>  #define PC_I440FX_2_2_MACHINE_OPTIONS                           \
>      PC_I440FX_MACHINE_OPTIONS,                                  \
> -    .default_machine_opts = "firmware=bios-256k.bin"
> +    .default_machine_opts = "firmware=bios-256k.bin",           \
> +    .default_display = "std"
>  
>  static QEMUMachine pc_i440fx_machine_v2_2 = {
>      PC_I440FX_2_2_MACHINE_OPTIONS,
> @@ -466,7 +467,9 @@ static QEMUMachine pc_i440fx_machine_v2_2 = {
>      .is_default = 1,
>  };
>  
> -#define PC_I440FX_2_1_MACHINE_OPTIONS PC_I440FX_2_2_MACHINE_OPTIONS
> +#define PC_I440FX_2_1_MACHINE_OPTIONS                           \
> +    PC_I440FX_MACHINE_OPTIONS,                                  \
> +    .default_machine_opts = "firmware=bios-256k.bin"

I think the normal way to do this is the opposite of this; i.e.
make the display defaults be the new behaviour, then add the .default_display = "cirrus"
to the v2_1 machine type, and everything below it will automatically inherit
it, and everything newer will just use the new default.

Dave

>  
>  static QEMUMachine pc_i440fx_machine_v2_1 = {
>      PC_I440FX_2_1_MACHINE_OPTIONS,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index e225c6d..9fdb3fa 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -353,7 +353,8 @@ static void pc_q35_init_1_4(MachineState *machine)
>  
>  #define PC_Q35_2_2_MACHINE_OPTIONS                      \
>      PC_Q35_MACHINE_OPTIONS,                             \
> -    .default_machine_opts = "firmware=bios-256k.bin"
> +    .default_machine_opts = "firmware=bios-256k.bin",   \
> +    .default_display = "std"
>  
>  static QEMUMachine pc_q35_machine_v2_2 = {
>      PC_Q35_2_2_MACHINE_OPTIONS,
> @@ -362,7 +363,9 @@ static QEMUMachine pc_q35_machine_v2_2 = {
>      .init = pc_q35_init,
>  };
>  
> -#define PC_Q35_2_1_MACHINE_OPTIONS PC_Q35_2_2_MACHINE_OPTIONS
> +#define PC_Q35_2_1_MACHINE_OPTIONS                      \
> +    PC_Q35_MACHINE_OPTIONS,                             \
> +    .default_machine_opts = "firmware=bios-256k.bin"
>  
>  static QEMUMachine pc_q35_machine_v2_1 = {
>      PC_Q35_2_1_MACHINE_OPTIONS,
> -- 
> 1.8.3.1
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-10-28 10:37   ` Dr. David Alan Gilbert
@ 2014-10-28 10:48     ` Gerd Hoffmann
  0 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2014-10-28 10:48 UTC (permalink / raw)
  To: Dr. David Alan Gilbert
  Cc: ajax, qemu-devel, Anthony Liguori, Michael S. Tsirkin

On Di, 2014-10-28 at 10:37 +0000, Dr. David Alan Gilbert wrote:
> * Gerd Hoffmann (kraxel@redhat.com) wrote:
> > This patch switches the default display from cirrus to vga
> > for the new (qemu 2.2+) machine types.  Old machines types
> > stay as-is for compatibility reasons.
> > 
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> > ---
> >  hw/i386/pc_piix.c | 7 +++++--
> >  hw/i386/pc_q35.c  | 7 +++++--
> >  2 files changed, 10 insertions(+), 4 deletions(-)
> > 
> > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> > index 91a20cb..8637246 100644
> > --- a/hw/i386/pc_piix.c
> > +++ b/hw/i386/pc_piix.c
> > @@ -456,7 +456,8 @@ static void pc_xen_hvm_init(MachineState *machine)
> >  
> >  #define PC_I440FX_2_2_MACHINE_OPTIONS                           \
> >      PC_I440FX_MACHINE_OPTIONS,                                  \
> > -    .default_machine_opts = "firmware=bios-256k.bin"
> > +    .default_machine_opts = "firmware=bios-256k.bin",           \
> > +    .default_display = "std"
> >  
> >  static QEMUMachine pc_i440fx_machine_v2_2 = {
> >      PC_I440FX_2_2_MACHINE_OPTIONS,
> > @@ -466,7 +467,9 @@ static QEMUMachine pc_i440fx_machine_v2_2 = {
> >      .is_default = 1,
> >  };
> >  
> > -#define PC_I440FX_2_1_MACHINE_OPTIONS PC_I440FX_2_2_MACHINE_OPTIONS
> > +#define PC_I440FX_2_1_MACHINE_OPTIONS                           \
> > +    PC_I440FX_MACHINE_OPTIONS,                                  \
> > +    .default_machine_opts = "firmware=bios-256k.bin"
> 
> I think the normal way to do this is the opposite of this; i.e.
> make the display defaults be the new behaviour, then add the .default_display = "cirrus"
> to the v2_1 machine type, and everything below it will automatically inherit
> it, and everything newer will just use the new default.

That is indeed the case for (device) compat properties,
but not for QEMUMachine entries.  default_display logic follows the way
default_machine_opts works.

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 0/2] vga: demote cirrus
  2014-10-28  9:09 [Qemu-devel] [PATCH 0/2] vga: demote cirrus Gerd Hoffmann
  2014-10-28  9:09 ` [Qemu-devel] [PATCH 1/2] vga: add default display to machine class Gerd Hoffmann
  2014-10-28  9:09 ` [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga Gerd Hoffmann
@ 2014-11-02 11:14 ` Michael S. Tsirkin
  2014-11-03  7:10   ` Gerd Hoffmann
  2014-11-03 10:29 ` Michael S. Tsirkin
  3 siblings, 1 reply; 15+ messages in thread
From: Michael S. Tsirkin @ 2014-11-02 11:14 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: ajax, qemu-devel

On Tue, Oct 28, 2014 at 10:09:10AM +0100, Gerd Hoffmann wrote:
>   Hi,
> 
> Time to flip the default to stdvga.  Done for 2.2+ machine types only,
> for obvious compatibility reasons.
> 
> https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/

Would you classify this a bugfix?  If not, this missed soft freeze
deadline, so should be deferred to 2.3?



> Gerd Hoffmann (2):
>   vga: add default display to machine class
>   vga: flip qemu 2.2 pc machine types from cirrus to stdvga
> 
>  hw/i386/pc.c        | 1 +
>  hw/i386/pc_piix.c   | 7 +++++--
>  hw/i386/pc_q35.c    | 7 +++++--
>  include/hw/boards.h | 2 ++
>  vl.c                | 5 ++++-
>  5 files changed, 17 insertions(+), 5 deletions(-)
> 
> -- 
> 1.8.3.1
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 0/2] vga: demote cirrus
  2014-11-02 11:14 ` [Qemu-devel] [PATCH 0/2] vga: demote cirrus Michael S. Tsirkin
@ 2014-11-03  7:10   ` Gerd Hoffmann
  2014-11-03  7:43     ` Markus Armbruster
  0 siblings, 1 reply; 15+ messages in thread
From: Gerd Hoffmann @ 2014-11-03  7:10 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: ajax, qemu-devel

On So, 2014-11-02 at 13:14 +0200, Michael S. Tsirkin wrote:
> On Tue, Oct 28, 2014 at 10:09:10AM +0100, Gerd Hoffmann wrote:
> >   Hi,
> > 
> > Time to flip the default to stdvga.  Done for 2.2+ machine types only,
> > for obvious compatibility reasons.
> > 
> > https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
> 
> Would you classify this a bugfix?  If not, this missed soft freeze
> deadline, so should be deferred to 2.3?

Given that cirrus simply can't meet todays graphics needs I think this
can be classified as bugfix.  And as we don't add something new but just
flip the default to something more sane I don't expect any stability
issues from adding this post freeze.

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 0/2] vga: demote cirrus
  2014-11-03  7:10   ` Gerd Hoffmann
@ 2014-11-03  7:43     ` Markus Armbruster
  0 siblings, 0 replies; 15+ messages in thread
From: Markus Armbruster @ 2014-11-03  7:43 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: ajax, qemu-devel, Michael S. Tsirkin

Gerd Hoffmann <kraxel@redhat.com> writes:

> On So, 2014-11-02 at 13:14 +0200, Michael S. Tsirkin wrote:
>> On Tue, Oct 28, 2014 at 10:09:10AM +0100, Gerd Hoffmann wrote:
>> >   Hi,
>> > 
>> > Time to flip the default to stdvga.  Done for 2.2+ machine types only,
>> > for obvious compatibility reasons.
>> > 
>> > https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
>> 
>> Would you classify this a bugfix?  If not, this missed soft freeze
>> deadline, so should be deferred to 2.3?
>
> Given that cirrus simply can't meet todays graphics needs I think this
> can be classified as bugfix.  And as we don't add something new but just
> flip the default to something more sane I don't expect any stability
> issues from adding this post freeze.

No need for semantic games as far as I'm concerned.  We should be
serious about soft freeze, but not dogmatic.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 0/2] vga: demote cirrus
  2014-10-28  9:09 [Qemu-devel] [PATCH 0/2] vga: demote cirrus Gerd Hoffmann
                   ` (2 preceding siblings ...)
  2014-11-02 11:14 ` [Qemu-devel] [PATCH 0/2] vga: demote cirrus Michael S. Tsirkin
@ 2014-11-03 10:29 ` Michael S. Tsirkin
  3 siblings, 0 replies; 15+ messages in thread
From: Michael S. Tsirkin @ 2014-11-03 10:29 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: ajax, qemu-devel

On Tue, Oct 28, 2014 at 10:09:10AM +0100, Gerd Hoffmann wrote:
>   Hi,
> 
> Time to flip the default to stdvga.  Done for 2.2+ machine types only,
> for obvious compatibility reasons.
> 
> https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
> 
> Gerd Hoffmann (2):
>   vga: add default display to machine class
>   vga: flip qemu 2.2 pc machine types from cirrus to stdvga

OK I trust your judgement that it's a good idea even though it's late.
Applied, thanks!


>  hw/i386/pc.c        | 1 +
>  hw/i386/pc_piix.c   | 7 +++++--
>  hw/i386/pc_q35.c    | 7 +++++--
>  include/hw/boards.h | 2 ++
>  vl.c                | 5 ++++-
>  5 files changed, 17 insertions(+), 5 deletions(-)
> 
> -- 
> 1.8.3.1
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-10-28  9:09 ` [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga Gerd Hoffmann
  2014-10-28 10:37   ` Dr. David Alan Gilbert
@ 2014-11-23 12:11   ` Michael S. Tsirkin
  2014-11-24  8:55     ` Gerd Hoffmann
  1 sibling, 1 reply; 15+ messages in thread
From: Michael S. Tsirkin @ 2014-11-23 12:11 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: ajax, qemu-devel

On Tue, Oct 28, 2014 at 10:09:12AM +0100, Gerd Hoffmann wrote:
> This patch switches the default display from cirrus to vga
> for the new (qemu 2.2+) machine types.  Old machines types
> stay as-is for compatibility reasons.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


Gerd, I noticed that this caused a regression:
suspend no longer works with windows, the option
to suspend is greyed out.

This is not new - it was disabled with -vga std previously -
but poses a bigger problem now it's the default?
Thoughts?  Something we can fix for 2.2?


> ---
>  hw/i386/pc_piix.c | 7 +++++--
>  hw/i386/pc_q35.c  | 7 +++++--
>  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 91a20cb..8637246 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -456,7 +456,8 @@ static void pc_xen_hvm_init(MachineState *machine)
>  
>  #define PC_I440FX_2_2_MACHINE_OPTIONS                           \
>      PC_I440FX_MACHINE_OPTIONS,                                  \
> -    .default_machine_opts = "firmware=bios-256k.bin"
> +    .default_machine_opts = "firmware=bios-256k.bin",           \
> +    .default_display = "std"
>  
>  static QEMUMachine pc_i440fx_machine_v2_2 = {
>      PC_I440FX_2_2_MACHINE_OPTIONS,
> @@ -466,7 +467,9 @@ static QEMUMachine pc_i440fx_machine_v2_2 = {
>      .is_default = 1,
>  };
>  
> -#define PC_I440FX_2_1_MACHINE_OPTIONS PC_I440FX_2_2_MACHINE_OPTIONS
> +#define PC_I440FX_2_1_MACHINE_OPTIONS                           \
> +    PC_I440FX_MACHINE_OPTIONS,                                  \
> +    .default_machine_opts = "firmware=bios-256k.bin"
>  
>  static QEMUMachine pc_i440fx_machine_v2_1 = {
>      PC_I440FX_2_1_MACHINE_OPTIONS,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index e225c6d..9fdb3fa 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -353,7 +353,8 @@ static void pc_q35_init_1_4(MachineState *machine)
>  
>  #define PC_Q35_2_2_MACHINE_OPTIONS                      \
>      PC_Q35_MACHINE_OPTIONS,                             \
> -    .default_machine_opts = "firmware=bios-256k.bin"
> +    .default_machine_opts = "firmware=bios-256k.bin",   \
> +    .default_display = "std"
>  
>  static QEMUMachine pc_q35_machine_v2_2 = {
>      PC_Q35_2_2_MACHINE_OPTIONS,
> @@ -362,7 +363,9 @@ static QEMUMachine pc_q35_machine_v2_2 = {
>      .init = pc_q35_init,
>  };
>  
> -#define PC_Q35_2_1_MACHINE_OPTIONS PC_Q35_2_2_MACHINE_OPTIONS
> +#define PC_Q35_2_1_MACHINE_OPTIONS                      \
> +    PC_Q35_MACHINE_OPTIONS,                             \
> +    .default_machine_opts = "firmware=bios-256k.bin"
>  
>  static QEMUMachine pc_q35_machine_v2_1 = {
>      PC_Q35_2_1_MACHINE_OPTIONS,
> -- 
> 1.8.3.1

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-11-23 12:11   ` Michael S. Tsirkin
@ 2014-11-24  8:55     ` Gerd Hoffmann
  2014-11-24 11:50       ` Michael S. Tsirkin
  0 siblings, 1 reply; 15+ messages in thread
From: Gerd Hoffmann @ 2014-11-24  8:55 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: ajax, qemu-devel

On So, 2014-11-23 at 14:11 +0200, Michael S. Tsirkin wrote:
> On Tue, Oct 28, 2014 at 10:09:12AM +0100, Gerd Hoffmann wrote:
> > This patch switches the default display from cirrus to vga
> > for the new (qemu 2.2+) machine types.  Old machines types
> > stay as-is for compatibility reasons.
> > 
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> 
> Gerd, I noticed that this caused a regression:
> suspend no longer works with windows, the option
> to suspend is greyed out.
> 
> This is not new - it was disabled with -vga std previously -
> but poses a bigger problem now it's the default?
> Thoughts?  Something we can fix for 2.2?

Which windows version is this?

I'm wondering why windows handles stdvga different from cirrus.  Recent
windows versions don't ship cirrus drivers any more, so windows uses the
vgabios to drive the card in both cases ...

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-11-24  8:55     ` Gerd Hoffmann
@ 2014-11-24 11:50       ` Michael S. Tsirkin
  2014-11-24 12:18         ` Gerd Hoffmann
  0 siblings, 1 reply; 15+ messages in thread
From: Michael S. Tsirkin @ 2014-11-24 11:50 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: ajax, qemu-devel

On Mon, Nov 24, 2014 at 09:55:11AM +0100, Gerd Hoffmann wrote:
> On So, 2014-11-23 at 14:11 +0200, Michael S. Tsirkin wrote:
> > On Tue, Oct 28, 2014 at 10:09:12AM +0100, Gerd Hoffmann wrote:
> > > This patch switches the default display from cirrus to vga
> > > for the new (qemu 2.2+) machine types.  Old machines types
> > > stay as-is for compatibility reasons.
> > > 
> > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> > 
> > 
> > Gerd, I noticed that this caused a regression:
> > suspend no longer works with windows, the option
> > to suspend is greyed out.
> > 
> > This is not new - it was disabled with -vga std previously -
> > but poses a bigger problem now it's the default?
> > Thoughts?  Something we can fix for 2.2?
> 
> Which windows version is this?
> 
> I'm wondering why windows handles stdvga different from cirrus.  Recent
> windows versions don't ship cirrus drivers any more, so windows uses the
> vgabios to drive the card in both cases ...
> 
> cheers,
>   Gerd
> 

I tested with XP. I can try others if you like.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-11-24 11:50       ` Michael S. Tsirkin
@ 2014-11-24 12:18         ` Gerd Hoffmann
  2014-11-25 10:35           ` Michael S. Tsirkin
  0 siblings, 1 reply; 15+ messages in thread
From: Gerd Hoffmann @ 2014-11-24 12:18 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: ajax, qemu-devel

  Hi,

> > > This is not new - it was disabled with -vga std previously -
> > > but poses a bigger problem now it's the default?
> > > Thoughts?  Something we can fix for 2.2?
> > 
> > Which windows version is this?
> > 
> > I'm wondering why windows handles stdvga different from cirrus.  Recent
> > windows versions don't ship cirrus drivers any more, so windows uses the
> > vgabios to drive the card in both cases ...
> > 
> > cheers,
> >   Gerd
> > 
> 
> I tested with XP. I can try others if you like.

Yep.  WinXP was the last release shipping with cirrus drivers, so, yes,
it'll be a change there.  On anything more recent I'd expect you don't
see a difference in behavior between cirrus and stdvga.

WinXP is out of support though, and I see little reason to care too much
here.  Especially as this is only about picking a default, not about
dropping cirrus support.  If you need it it is still there, and machine
types for 2.1 & older continue to default to cirrus.

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-11-24 12:18         ` Gerd Hoffmann
@ 2014-11-25 10:35           ` Michael S. Tsirkin
  2014-11-25 15:05             ` Gerd Hoffmann
  0 siblings, 1 reply; 15+ messages in thread
From: Michael S. Tsirkin @ 2014-11-25 10:35 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: ajax, qemu-devel

On Mon, Nov 24, 2014 at 01:18:59PM +0100, Gerd Hoffmann wrote:
>   Hi,
> 
> > > > This is not new - it was disabled with -vga std previously -
> > > > but poses a bigger problem now it's the default?
> > > > Thoughts?  Something we can fix for 2.2?
> > > 
> > > Which windows version is this?
> > > 
> > > I'm wondering why windows handles stdvga different from cirrus.  Recent
> > > windows versions don't ship cirrus drivers any more, so windows uses the
> > > vgabios to drive the card in both cases ...
> > > 
> > > cheers,
> > >   Gerd
> > > 
> > 
> > I tested with XP. I can try others if you like.
> 
> Yep.  WinXP was the last release shipping with cirrus drivers, so, yes,
> it'll be a change there.  On anything more recent I'd expect you don't
> see a difference in behavior between cirrus and stdvga.
> 
> WinXP is out of support though, and I see little reason to care too much
> here.  Especially as this is only about picking a default, not about
> dropping cirrus support.  If you need it it is still there, and machine
> types for 2.1 & older continue to default to cirrus.
> 
> cheers,
>   Gerd

I checked windows 7, and I see a problem with it, as well:
with -vga cirrus, hybernate is enabled, with new default,
it is disabled :(

-- 
MST

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga
  2014-11-25 10:35           ` Michael S. Tsirkin
@ 2014-11-25 15:05             ` Gerd Hoffmann
  0 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2014-11-25 15:05 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: ajax, qemu-devel

  Hi,

> I checked windows 7, and I see a problem with it, as well:
> with -vga cirrus, hybernate is enabled, with new default,
> it is disabled :(

No difference here.  sleep is grayed, hibernate is available, for both
cirrus+stdvga.

Noticed that hibernate was grayed on the first vm boot with cirrus
plugged in though, so maybe you have to reboot once after windows went
through the new-hardware-found cycle.

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2014-11-25 15:05 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-28  9:09 [Qemu-devel] [PATCH 0/2] vga: demote cirrus Gerd Hoffmann
2014-10-28  9:09 ` [Qemu-devel] [PATCH 1/2] vga: add default display to machine class Gerd Hoffmann
2014-10-28  9:09 ` [Qemu-devel] [PATCH 2/2] vga: flip qemu 2.2 pc machine types from cirrus to stdvga Gerd Hoffmann
2014-10-28 10:37   ` Dr. David Alan Gilbert
2014-10-28 10:48     ` Gerd Hoffmann
2014-11-23 12:11   ` Michael S. Tsirkin
2014-11-24  8:55     ` Gerd Hoffmann
2014-11-24 11:50       ` Michael S. Tsirkin
2014-11-24 12:18         ` Gerd Hoffmann
2014-11-25 10:35           ` Michael S. Tsirkin
2014-11-25 15:05             ` Gerd Hoffmann
2014-11-02 11:14 ` [Qemu-devel] [PATCH 0/2] vga: demote cirrus Michael S. Tsirkin
2014-11-03  7:10   ` Gerd Hoffmann
2014-11-03  7:43     ` Markus Armbruster
2014-11-03 10:29 ` Michael S. Tsirkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).