]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150707-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 7 Jul 2015 13:44:19 +0000 (14:44 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 7 Jul 2015 13:44:19 +0000 (14:44 +0100)
commitaeb72188e073d515e1f5a80f6b603692a396477b
tree10a646ef78d260148d8cf26e7e517a7940308b1e
parent1452673888f6d7f0454276d049846c9bec659233
parent501eea4f4187b6c62b6cf348ab0b100d57d8c56b
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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* 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 <peter.maydell@linaro.org>