aboutsummaryrefslogtreecommitdiff
path: root/sysemu.h
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2010-12-27 22:59:48 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-12-27 22:59:48 +0100
commit818c2e1b9777599d333855330d94050b3432c8b7 (patch)
treedf85b289b7c0f797fbf5bf8ca5bca4422b387aa7 /sysemu.h
parent4058fd98fd7e9c476774717adbd49698dd273166 (diff)
parent7572150c189c6553c2448334116ab717680de66d (diff)
downloadqemu-818c2e1b9777599d333855330d94050b3432c8b7.zip
qemu-818c2e1b9777599d333855330d94050b3432c8b7.tar.gz
qemu-818c2e1b9777599d333855330d94050b3432c8b7.tar.bz2
Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu
* 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu: vnc/spice: add set_passwd monitor command. vnc: support password expire vnc: auth reject cleanup spice: add qmp 'query-spice' and hmp 'info spice' commands. spice: connection events. spice: add qxl device spice: add qxl vgabios binary.
Diffstat (limited to 'sysemu.h')
-rw-r--r--sysemu.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysemu.h b/sysemu.h
index 38a20a3..e728ea1 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;