summary refs log tree commit diff stats
path: root/fsdev/virtfs-proxy-helper.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-06-16 10:35:43 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-06-16 10:35:43 +0100
commit93f6d1c16036aaf34055d16f54ea770fb8d6d280 (patch)
tree393cd2f4938259be149b6e41813cba6b3e726e71 /fsdev/virtfs-proxy-helper.c
parent4316536bf424d2e7f9cfa7d0dd561adb0986cc81 (diff)
parent7a4dfd1e4a741991df1acf31672b391648e0aa0c (diff)
downloadfocaccia-qemu-93f6d1c16036aaf34055d16f54ea770fb8d6d280.tar.gz
focaccia-qemu-93f6d1c16036aaf34055d16f54ea770fb8d6d280.zip
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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'fsdev/virtfs-proxy-helper.c')
0 files changed, 0 insertions, 0 deletions