From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 8 Jun 2011 17:15:11 +0000 (-0500)
Subject: Merge remote-tracking branch 'spice/spice.v37' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac779fe2334ebea5d4a365b053d786f7748a1db5;p=qmiga%2Fqemu.git

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

Conflicts:
	vl.c
---

ac779fe2334ebea5d4a365b053d786f7748a1db5
diff --cc vl.c
index 04b4a20ecc,2021bbb48b..d7f905df3a
--- a/vl.c
+++ b/vl.c
@@@ -289,7 -289,7 +289,8 @@@ static struct 
      { .driver = "VGA",                  .flag = &default_vga       },
      { .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)