From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBi-00039q-8S for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAJBg-0000yG-16 for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:58 -0400 Received: from hall.aurel32.net ([88.191.126.93]:57351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBf-0000wu-Qu for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:55 -0400 From: Aurelien Jarno Date: Sat, 8 Sep 2012 13:26:14 +0200 Message-Id: <1347103584-20598-3-git-send-email-aurelien@aurel32.net> In-Reply-To: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> References: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH 02/12] vl.c: check for qxl availability List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Gerd Hoffmann , Aurelien Jarno Check for qxl availability in vl.c. This will allow to remove #ifdef CONFIG_SPICE .. #endif later in this series Cc: Anthony Liguori Cc: Gerd Hoffmann Signed-off-by: Aurelien Jarno --- vl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 7c577fa..6363915 100644 --- a/vl.c +++ b/vl.c @@ -1703,6 +1703,11 @@ static bool vmware_vga_available(void) return qdev_exists("vmware-svga"); } +static bool qxl_vga_available(void) +{ + return qdev_exists("qxl-vga"); +} + static void select_vgahw (const char *p) { const char *opts; @@ -1732,7 +1737,12 @@ static void select_vgahw (const char *p) } else if (strstart(p, "xenfb", &opts)) { vga_interface_type = VGA_XENFB; } 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)) { invalid_vga: fprintf(stderr, "Unknown vga type: %s\n", p); -- 1.7.10.4