spice: add qxl device

[mirror_qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 2cd263eda4cb2f48fcb54f99022f6d6b0ec635da..e3f79e0d8d0f81ec7b62a894cfdd277ea03eaafa 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -1411,6 +1411,8 @@ static void select_vgahw (const char *p)
         vga_interface_type = VGA_VMWARE;
     } else if (strstart(p, "xenfb", &opts)) {
         vga_interface_type = VGA_XENFB;
+    } else if (strstart(p, "qxl", &opts)) {
+        vga_interface_type = VGA_QXL;
     } else if (!strstart(p, "none", &opts)) {
     invalid_vga:
         fprintf(stderr, "Unknown vga type: %s\n", p);
@@ -2945,7 +2947,7 @@ int main(int argc, char **argv, char **envp)
         }
     }
 #ifdef CONFIG_SPICE
-    if (using_spice) {
+    if (using_spice && !qxl_enabled) {
         qemu_spice_display_init(ds);
     }
 #endif