summary refs log tree commit diff stats
path: root/hw/display/virtio-gpu.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-06-11 12:12:58 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-06-11 12:12:58 +0100
commit169b71331eaff7a28e3d4fabe8733e7db91f01aa (patch)
tree60a2337ecf6ef87cfa6200d545e5fa9443245413 /hw/display/virtio-gpu.c
parent39e16a5b708358202e8d2252e3d84863666dc9e5 (diff)
parent5a9259a0b5d6f9424f94539cd9c715b1d166d90c (diff)
downloadfocaccia-qemu-169b71331eaff7a28e3d4fabe8733e7db91f01aa.tar.gz
focaccia-qemu-169b71331eaff7a28e3d4fabe8733e7db91f01aa.zip
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>
Diffstat (limited to 'hw/display/virtio-gpu.c')
0 files changed, 0 insertions, 0 deletions