From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 19 Mar 2012 18:37:23 +0000 (-0500)
Subject: Merge remote-tracking branch 'spice/spice.v50' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dfebfcf02f74ed47b61841037d7eda1baffb4d6e;p=qemu.git

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

* spice/spice.v50:
  spice: fix broken initialization
  hw/qxl.c: Fix compilation failures on 32 bit hosts
  qxl/qxl_render.c: add trace events
  qxl: switch qxl.c to trace-events
  qxl: init_pipe_signaling: exit on failure
  monitor: fix client_migrate_info error handling
  spice: set spice uuid and name
---

dfebfcf02f74ed47b61841037d7eda1baffb4d6e