diff options
| author |   Peter Maydell <peter.maydell@linaro.org> | 2016-05-23 14:50:40 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-23 14:50:40 +0100 |
| commit | 38629bf5e4b563d7038cca50ca2c1f09640877da (patch) | |
| tree | f75323eba0e7a410a171fae77cca57b9a5f1a54b /io/channel-buffer.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging (diff) | |
| parent | vga: add sr_vbe register set (diff) | |
| download | qemu-38629bf5e4b563d7038cca50ca2c1f09640877da.tar.xz qemu-38629bf5e4b563d7038cca50ca2c1f09640877da.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160523-1' into staging
vga: fix CVE-2016-3712 regression, misc virtio-gpu fixes.
# gpg: Signature made Mon 23 May 2016 13:30:26 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/kraxel/tags/pull-vga-20160523-1:
vga: add sr_vbe register set
virtio-gpu: fix ui idx check
virtio-gpu: use VIRTIO_GPU_MAX_SCANOUTS
virtio-gpu: check max_outputs only
virtio-gpu: check max_outputs value
virtio-vga: propagate on gpu realized error
virtio-gpu: check early scanout id
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/channel-buffer.c')
0 files changed, 0 insertions, 0 deletions