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

Conflicts:
	vl.c

diff --cc configure
Simple merge

diff --cc vl.c
index 04b4a20ecc25328be222149b03090f9bce73aa98,2021bbb48bc0309ca3654c061aaafa0fd84814e2..d7f905df3a658dc417358aae396491f91a5c8700
--- 1/vl.c
--- 2/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)