OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vl.c: check for qxl availability

Browse Source 
Check for qxl availability in vl.c. This will allow to remove #ifdef
CONFIG_SPICE .. #endif later in this series

Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2012-09-08 12:01:06 +02:00
parent 36b7f27d21
commit 879049a397
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vl.c
View File

@ -1714,6 +1714,11 @@ static bool vmware_vga_available(void)
return object_class_by_name("vmware-svga"); return object_class_by_name("vmware-svga");
} }
static bool qxl_vga_available(void)
{
return object_class_by_name("qxl-vga");
}
static void select_vgahw (const char *p) static void select_vgahw (const char *p)
{ {
const char *opts; const char *opts;
@ -1743,7 +1748,12 @@ static void select_vgahw (const char *p)
} else if (strstart(p, "xenfb", &opts)) { } else if (strstart(p, "xenfb", &opts)) {
vga_interface_type = VGA_XENFB; vga_interface_type = VGA_XENFB;
} else if (strstart(p, "qxl", &opts)) { } else if (strstart(p, "qxl", &opts)) {
vga_interface_type = VGA_QXL; if (qxl_vga_available()) {
vga_interface_type = VGA_QXL;
} else {
fprintf(stderr, "Error: QXL VGA not available\n");
exit(0);
}
} else if (!strstart(p, "none", &opts)) { } else if (!strstart(p, "none", &opts)) {
invalid_vga: invalid_vga:
fprintf(stderr, "Unknown vga type: %s\n", p); fprintf(stderr, "Unknown vga type: %s\n", p);