From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 29 Feb 2012 18:54:08 +0000 (-0600)
Subject: Merge remote-tracking branch 'spice/spice.v49' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f06d0f0755dbd9fee2fd3f21eefd2b19105fa346;p=qemu.git

Merge remote-tracking branch 'spice/spice.v49' into staging

* spice/spice.v49:
  qxl: properly handle upright and non-shared surfaces
  Error out when tls-channel option is used without TLS
  spice: use error_report to report errors
  qxl: add optinal 64bit vram bar
  qxl: make qxl_render_update async
  qxl: introduce QXLCookie
  qxl: remove flipped
  qxl: require spice >= 0.8.2
  qxl: drop qxl_spice_update_area_async definition
  sdl: remove NULL check, g_malloc0 can't fail
  qxl: fix spice+sdl no cursor regression
---

f06d0f0755dbd9fee2fd3f21eefd2b19105fa346