diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-16 10:35:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-16 10:35:43 +0100 |
| commit | 93f6d1c16036aaf34055d16f54ea770fb8d6d280 (patch) | |
| tree | 393cd2f4938259be149b6e41813cba6b3e726e71 /hw/display/Makefile.objs | |
| parent | 4316536bf424d2e7f9cfa7d0dd561adb0986cc81 (diff) | |
| parent | 7a4dfd1e4a741991df1acf31672b391648e0aa0c (diff) | |
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 'hw/display/Makefile.objs')
| -rw-r--r-- | hw/display/Makefile.objs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 61c80f319d..dd8ea76d17 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -36,3 +36,5 @@ obj-$(CONFIG_VGA) += vga.o common-obj-$(CONFIG_QXL) += qxl.o qxl-logger.o qxl-render.o obj-$(CONFIG_VIRTIO) += virtio-gpu.o +obj-$(CONFIG_VIRTIO_PCI) += virtio-gpu-pci.o +obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o |