Merge remote-tracking branch 'spice/spice.v37' into staging

Conflicts:
	vl.c
This commit is contained in:
Anthony Liguori 2011-06-08 12:15:11 -05:00
commit ac779fe233
7 changed files with 53 additions and 19 deletions

1
vl.c
View file

@ -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)