]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170320-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Mar 2017 10:05:45 +0000 (10:05 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Mar 2017 10:05:45 +0000 (10:05 +0000)
fixes for 2.9: vnc, cirrus, tcg display updates.

# gpg: Signature made Mon 20 Mar 2017 08:52:34 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-fixes-20170320-1:
  vnc: fix a qio-channel leak
  cirrus: fix off-by-one in cirrus_bitblt_rop_bkwd_transp_*_16
  ui/console: ensure graphic updates don't race with TCG vCPUs

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

Trivial merge