diff options
| author | Peter Maydell | 2017-04-11 11:03:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-04-11 11:03:51 +0200 |
| commit | 17fa24b79ceaa8258e415822cf2e2cb23cf3facb (patch) | |
| tree | 6977d943899f3f100015250ec5ba08f0e1531e40 /include/block | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | qxl: add migration blocker to avoid pre-save assert (diff) | |
| download | qemu-17fa24b79ceaa8258e415822cf2e2cb23cf3facb.tar.gz qemu-17fa24b79ceaa8258e415822cf2e2cb23cf3facb.tar.xz qemu-17fa24b79ceaa8258e415822cf2e2cb23cf3facb.zip | |
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>
Diffstat (limited to 'include/block')
0 files changed, 0 insertions, 0 deletions