Merge remote-tracking branch 'spice/spice.v58' into staging
commit3aa42d329b4a26af6105ff199be1a785b9ddd461
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:07:03 +0000 (26 15:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:07:03 +0000 (26 15:07 -0500)
tree8cb011152af3a1d4e27aa5c8da15a806fc85b723
parent675658d97e86c42278fc08f8fb4c9531a027b4e7
parent9e56edcf8dd1d4bc7ba2b1efb3641f36c0fad8ba
Merge remote-tracking branch 'spice/spice.v58' into staging

* spice/spice.v58:
  vga: raise default vgamem size
  add pc-1.2
  qxl: add vgamem_size_mb and vgamem_size
  vga: make vram size configurable
  vga: raise xres+yres limits
  qxl: reset current_async on qxl_soft_reset
  hw/qxl: ignore guest from guestbug until reset
  qxl: stop dirty loging when not in vga mode
  hw/qxl: s/qxl_guest_bug/qxl_set_guest_bug/
  ui/spice-display.c: add missing initialization for valgrind