[Qemu-commits] [qemu/qemu] d44229: Fix vga_interface_type for command line argument '...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d44229c54f7477035c7e914dd12c84e01bbd4123
      
https://github.com/qemu/qemu/commit/d44229c54f7477035c7e914dd12c84e01bbd4123
  Author: Mark Wu <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  Fix vga_interface_type for command line argument '-device VGA'

Some machine (like pseries) initialization code determines if it has
graphics according to vga_interface_type. In the original code,
vga_interface_type is evaluated to VGA_NONE even if a VGA is added
via '-device VGA'. It causes the machine not aware of the graphics
device configured. Add a new VGA device type to indicate that it has a
VGA device, which will be initialized in QOM device initialization.

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Mark Wu <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 7effdaa32198b7077c51e29621dfca3d1b14e420
      
https://github.com/qemu/qemu/commit/7effdaa32198b7077c51e29621dfca3d1b14e420
  Author: Mark Wu <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M hw/ppc/spapr.c
    M vl.c

  Log Message:
  -----------
  spapr: Fix return value of vga initialization

Before spapr_vga_init will returned false if the vga is specified by
the command '-device VGA' because vga_interface_type was evaluated to
VGA_NONE. With the change in previous patch of this series,
spapr_vga_init should return true if it's told that the vga will be
initialized in flow of the generic devices initialization.

To keep '-nodefaults' have the semantics of bare minimum, it adds a
check of 'has_defaults' in usb_enabled() to avoid that a USB controller
is added by '-nodefautls, -device VGA' implicitly.

This patch also makes two cleanups:
1. skip initialization for VGA_NONE
2. remove the useless 'break'

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Mark Wu <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 90c5d39cb847d7f360454950be647cd83cacea58
      
https://github.com/qemu/qemu/commit/90c5d39cb847d7f360454950be647cd83cacea58
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M hw/ppc/spapr.c
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging

PowerPC queue for 2.0

* Fixes for -device VGA

# gpg: Signature made Thu 13 Mar 2014 19:57:12 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <address@hidden>"
# gpg:                 aka "Andreas Färber <address@hidden>"

* remotes/afaerber/tags/ppc-for-2.0:
  spapr: Fix return value of vga initialization
  Fix vga_interface_type for command line argument '-device VGA'

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/8bf0975902bb...90c5d39cb847