tree 427fc2ceba391f3f9de282d5e67fe8bb8e6d1618
parent 5ca2358ac895139e624881c5b3bf3095d3cc4515
parent e2efc0a3267811a2b9459116b2310325ef011f6e
author Anthony Liguori <aliguori@us.ibm.com> 1330541648 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1330541648 -0600

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