summary refs log tree commit diff stats
path: root/hw
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2014-09-10 14:28:48 +0200
committerGerd Hoffmann <kraxel@redhat.com>2015-06-12 10:13:23 +0200
commita94f0c5ca2f0e3dba4a64f40c9d2e1149017d81d (patch)
treefb15f7539713c3b9338854ce188b8bdb86471c39 /hw
parentc5d4dac86b61070c078a7b35e25f56d2c8bff508 (diff)
downloadfocaccia-qemu-a94f0c5ca2f0e3dba4a64f40c9d2e1149017d81d.tar.gz
focaccia-qemu-a94f0c5ca2f0e3dba4a64f40c9d2e1149017d81d.zip
virtio-vga: add '-vga virtio' support
Some convinience fluff:  Add support for '-vga virtio', also add
virtio-vga to the list of vga cards so '-device virtio-vga' will
turn off the default vga.

Written by Dave Airlie and Gerd Hoffmann.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/isa/isa-bus.c3
-rw-r--r--hw/pci/pci.c2
2 files changed, 5 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;
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 750f3dacea..21580433d4 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1698,6 +1698,8 @@ PCIDevice *pci_vga_init(PCIBus *bus)
         return pci_create_simple(bus, -1, "VGA");
     case VGA_VMWARE:
         return pci_create_simple(bus, -1, "vmware-svga");
+    case VGA_VIRTIO:
+        return pci_create_simple(bus, -1, "virtio-vga");
     case VGA_NONE:
     default: /* Other non-PCI types. Checking for unsupported types is already
                 done in vl.c. */