From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 26 Jun 2012 20:07:03 +0000 (-0500)
Subject: Merge remote-tracking branch 'spice/spice.v58' into staging
X-Git-Tag: v1.2.0-rc0~239
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3aa42d329b4a26af6105ff199be1a785b9ddd461;p=qemu.git

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

3aa42d329b4a26af6105ff199be1a785b9ddd461