Merge remote branch 'kraxel/spice.v14' into spice.kvm.v14spice.kvm.v14.spicevmc

Conflicts:
	Makefile.target
	configure
	hw/pc.c
	monitor.c
	pc-bios/vgabios-cirrus.bin
	pc-bios/vgabios.bin

1 files changed, 2 insertions, 1 deletions

diff --git a/sysemu.h b/sysemu.h
index 98bd47da3..77ea1eaab 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -104,7 +104,7 @@ extern int incoming_expected;
 extern int bios_size;
 
 typedef enum {
-    VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB
+    VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
 } VGAInterfaceType;
 
 extern int vga_interface_type;
@@ -112,6 +112,7 @@ extern int vga_interface_type;
 #define std_vga_enabled (vga_interface_type == VGA_STD)
 #define xenfb_enabled (vga_interface_type == VGA_XENFB)
 #define vmsvga_enabled (vga_interface_type == VGA_VMWARE)
+#define qxl_enabled (vga_interface_type == VGA_QXL)
 
 extern int graphic_width;
 extern int graphic_height;