diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
| commit | 6107ff12922e5508a44b376b40a3041810cb00d2 (patch) | |
| tree | 56098d53043a8fcdd01dbf0dca565ceab09f95b3 /sysemu.h | |
| parent | be92bbf73dfd7d8a4786dc5f6c71590f4fbc5a32 (diff) | |
| parent | 8aaf42ed0f203da63860b0a3ab3ff2bdfe9b4cb0 (diff) | |
| download | qemu-6107ff12922e5508a44b376b40a3041810cb00d2.tar.gz qemu-6107ff12922e5508a44b376b40a3041810cb00d2.tar.bz2 qemu-6107ff12922e5508a44b376b40a3041810cb00d2.zip | |
Merge remote branch 'origin/master' into pci
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |