From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 11 Jun 2015 11:12:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150611-1' into staging
X-Git-Tag: v2.4.0-rc0~84
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=169b71331eaff7a28e3d4fabe8733e7db91f01aa;p=qemu-xen-unstable.git

Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150611-1' into staging

spice: fix segfault in qemu_spice_create_update, ui_info tweaks.

# gpg: Signature made Thu Jun 11 08:48:49 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20150611-1:
  spice: ui_info tweaks
  spice-display: fix segfault in qemu_spice_create_update

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

169b71331eaff7a28e3d4fabe8733e7db91f01aa