]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160913-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Sep 2016 12:56:35 +0000 (13:56 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Sep 2016 12:56:35 +0000 (13:56 +0100)
commitfa9701240951093907076db0943f96972a396ef5
treef24ce2ffe6c7ac316e8e316d48f8bf77ff491c5f
parente1c270c9404efe47c94b944818fdd093e418f938
parentc2843e93907a4084e91573994486e810cec248a0
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160913-1' into staging

virtio-gpu and vmsvga fixes.

# gpg: Signature made Tue 13 Sep 2016 09:14:44 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-vga-20160913-1:
  virtio-vga: adapt to page-per-vq=off
  virtio-gpu-pci: tag as not hotpluggable
  vmsvga: correct bitmap and pixmap size checks

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