]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150529-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 29 May 2015 09:17:48 +0000 (10:17 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 29 May 2015 09:17:49 +0000 (10:17 +0100)
commitba7c388963e099c0d2cedb7f048e30747ffff25d
tree0740800947805e1441b9f36953d3300afdcb47ee
parentce0274f730eacbd24c706523ddbbabb6b95d0659
parentf7a8beb5e6a13dc924895244777d9ef08b23b367
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150529-1' into staging

spice: misc fixes.

# gpg: Signature made Fri May 29 09:16:29 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-20150529-1:
  spice: fix spice_chr_add_watch() pre-condition
  spice: don't update mm_time when spice-server is stopped.
  spice-char: notify the server when chardev is writable
  virtio-console: notify chardev when writable

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