[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] virtio-vga: add '-vga virtio' support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 5/8] virtio-vga: add '-vga virtio' support |
Date: |
Tue, 23 Sep 2014 15:28:04 +0200 |
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pci/pci.c | 2 ++
include/sysemu/sysemu.h | 2 +-
vl.c | 13 +++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 6ce75aa..3328d98 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1653,6 +1653,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. */
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index d8539fd..3741855 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -107,7 +107,7 @@ extern int autostart;
typedef enum {
VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
- VGA_TCX, VGA_CG3, VGA_DEVICE
+ VGA_TCX, VGA_CG3, VGA_DEVICE, VGA_VIRTIO,
} VGAInterfaceType;
extern int vga_interface_type;
diff --git a/vl.c b/vl.c
index dc792fe..4cbd401 100644
--- a/vl.c
+++ b/vl.c
@@ -249,6 +249,7 @@ static struct {
{ .driver = "isa-cirrus-vga", .flag = &default_vga },
{ .driver = "vmware-svga", .flag = &default_vga },
{ .driver = "qxl-vga", .flag = &default_vga },
+ { .driver = "virtio-vga", .flag = &default_vga },
};
static QemuOptsList qemu_rtc_opts = {
@@ -2108,6 +2109,11 @@ static bool cg3_vga_available(void)
return object_class_by_name("cgthree");
}
+static bool virtio_vga_available(void)
+{
+ return object_class_by_name("virtio-vga");
+}
+
static void select_vgahw (const char *p)
{
const char *opts;
@@ -2134,6 +2140,13 @@ static void select_vgahw (const char *p)
fprintf(stderr, "Error: VMWare SVGA not available\n");
exit(0);
}
+ } else if (strstart(p, "virtio", &opts)) {
+ if (virtio_vga_available()) {
+ vga_interface_type = VGA_VIRTIO;
+ } else {
+ fprintf(stderr, "Error: Virtio VGA not available\n");
+ exit(0);
+ }
} else if (strstart(p, "xenfb", &opts)) {
vga_interface_type = VGA_XENFB;
} else if (strstart(p, "qxl", &opts)) {
--
1.8.3.1
- [Qemu-devel] [PATCH 0/8] add virtio-gpu, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PATCH 4/8] virtio-vga: add virtio gpu device with vga compatibility, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PATCH 7/8] virtio-vga: add vgabios binary, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PATCH 3/8] virtio-gpu-pci: add virtio pci support, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PATCH 2/8] virtio-gpu/2d: add virtio gpu core code, Gerd Hoffmann, 2014/09/23