From: Peter Maydell Date: Tue, 7 Jul 2015 13:44:19 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150707-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aeb72188e073d515e1f5a80f6b603692a396477b;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150707-1' into staging virtio-gpu property fixes, add testcase # gpg: Signature made Tue Jul 7 10:24:16 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-20150707-1: virtio-gpu: add to display-vga test virtio-gpu: use virtio_instance_init_common, fixup properties virtio-gpu: update console device property. Signed-off-by: Peter Maydell --- aeb72188e073d515e1f5a80f6b603692a396477b