From: Peter Maydell Date: Tue, 16 Jun 2015 09:35:43 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=93f6d1c16036aaf34055d16f54ea770fb8d6d280;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging virtio-gpu: pci support bits and virtio-vga. # gpg: Signature made Mon Jun 15 13:55:19 2015 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-vga-20150615-1: virtio-vga: add vgabios configuration virtio-vga: add '-vga virtio' support virtio-vga: add virtio gpu device with vga compatibility virtio-gpu-pci: add virtio pci support virtio-gpu: fix error message Signed-off-by: Peter Maydell --- 93f6d1c16036aaf34055d16f54ea770fb8d6d280