From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 13 Sep 2016 12:56:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160913-1' into staging
X-Git-Tag: v2.9.0-rc2~427
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fa9701240951093907076db0943f96972a396ef5;p=mirror_qemu.git

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>
---

fa9701240951093907076db0943f96972a396ef5