diff options
| author | Peter Maydell | 2015-06-16 11:35:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-16 11:35:43 +0200 |
| commit | 93f6d1c16036aaf34055d16f54ea770fb8d6d280 (patch) | |
| tree | 393cd2f4938259be149b6e41813cba6b3e726e71 /hw/isa | |
| parent | Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20150616' int... (diff) | |
| parent | virtio-vga: add vgabios configuration (diff) | |
| download | qemu-93f6d1c16036aaf34055d16f54ea770fb8d6d280.tar.gz qemu-93f6d1c16036aaf34055d16f54ea770fb8d6d280.tar.xz 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 'hw/isa')
| -rw-r--r-- | hw/isa/isa-bus.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index ec8e7decfc..43e0cd8ddd 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -179,6 +179,9 @@ ISADevice *isa_vga_init(ISABus *bus) case VGA_VMWARE: fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __func__); return NULL; + case VGA_VIRTIO: + fprintf(stderr, "%s: virtio-vga: no PCI bus\n", __func__); + return NULL; case VGA_NONE: default: return NULL; |