summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-06-08 12:15:11 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-06-08 12:15:11 -0500
commitac779fe2334ebea5d4a365b053d786f7748a1db5 (patch)
tree5459fe587195dcb74b3b2ca19dc2d4a39a9fb31e /vl.c
parent13748cf499fbd93468e7103c0866e073a666f270 (diff)
parent212496c98219df17913f3157a7bf85575b32384f (diff)
downloadqemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.tar.gz
Merge remote-tracking branch 'spice/spice.v37' into staging
Conflicts: vl.c
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index 04b4a20ecc..d7f905df3a 100644
--- a/vl.c
+++ b/vl.c
@@ -290,6 +290,7 @@ static struct {
{ .driver = "cirrus-vga", .flag = &default_vga },
{ .driver = "vmware-svga", .flag = &default_vga },
{ .driver = "isa-vga", .flag = &default_vga },
+ { .driver = "qxl-vga", .flag = &default_vga },
};
static int default_driver_check(QemuOpts *opts, void *opaque)