diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 14:44:19 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 14:44:19 +0100 |
commit | aeb72188e073d515e1f5a80f6b603692a396477b (patch) | |
tree | 10a646ef78d260148d8cf26e7e517a7940308b1e /hw/net/rocker/rocker.h | |
parent | 1452673888f6d7f0454276d049846c9bec659233 (diff) | |
parent | 501eea4f4187b6c62b6cf348ab0b100d57d8c56b (diff) | |
download | qemu-aeb72188e073d515e1f5a80f6b603692a396477b.zip qemu-aeb72188e073d515e1f5a80f6b603692a396477b.tar.gz qemu-aeb72188e073d515e1f5a80f6b603692a396477b.tar.bz2 |
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>
Diffstat (limited to 'hw/net/rocker/rocker.h')
0 files changed, 0 insertions, 0 deletions