From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 11 Apr 2017 09:03:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170411-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=17fa24b79ceaa8258e415822cf2e2cb23cf3facb;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170411-1' into staging

qxl: bugfixes.

# gpg: Signature made Tue 11 Apr 2017 08:00:00 BST
# 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-20170411-1:
  qxl: add migration blocker to avoid pre-save assert
  qxl: switch display on entering VGA

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

17fa24b79ceaa8258e415822cf2e2cb23cf3facb