From patchwork Sat Sep 8 11:26:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 182533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5C3F92C0085 for ; Sat, 8 Sep 2012 21:27:17 +1000 (EST) Received: from localhost ([::1]:57095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBz-0003AE-2h for incoming@patchwork.ozlabs.org; Sat, 08 Sep 2012 07:27:15 -0400 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 Received: from [77.227.137.151] (helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TAJBV-0007V3-Ji; Sat, 08 Sep 2012 13:26:45 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TAJBS-0005R1-Lj; Sat, 08 Sep 2012 13:26:42 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Sat, 8 Sep 2012 13:26:14 +0200 Message-Id: <1347103584-20598-3-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> References: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 88.191.126.93 Cc: Anthony Liguori , Gerd Hoffmann , Aurelien Jarno Subject: [Qemu-devel] [PATCH 02/12] vl.c: check for qxl availability X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);