From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LwExo-0003Kb-Se for qemu-devel@nongnu.org; Tue, 21 Apr 2009 08:20:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LwExk-0003IJ-7c for qemu-devel@nongnu.org; Tue, 21 Apr 2009 08:20:36 -0400 Received: from [199.232.76.173] (port=50856 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LwExj-0003I5-B1 for qemu-devel@nongnu.org; Tue, 21 Apr 2009 08:20:31 -0400 Received: from mx2.redhat.com ([66.187.237.31]:47944) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LwExi-0003Wx-U5 for qemu-devel@nongnu.org; Tue, 21 Apr 2009 08:20:31 -0400 From: Gerd Hoffmann Date: Tue, 21 Apr 2009 14:20:07 +0200 Message-Id: <1240316408-15949-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1240316408-15949-1-git-send-email-kraxel@redhat.com> References: <1240316408-15949-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 09/10] simplify vga selection List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, xen-devel@lists.xensource.com Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- vl.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/vl.c b/vl.c index 19cd28f..7d6dcb6 100644 --- a/vl.c +++ b/vl.c @@ -4162,23 +4162,16 @@ static void select_vgahw (const char *p) { const char *opts; + cirrus_vga_enabled = 0; + std_vga_enabled = 0; + vmsvga_enabled = 0; if (strstart(p, "std", &opts)) { std_vga_enabled = 1; - cirrus_vga_enabled = 0; - vmsvga_enabled = 0; } else if (strstart(p, "cirrus", &opts)) { cirrus_vga_enabled = 1; - std_vga_enabled = 0; - vmsvga_enabled = 0; } else if (strstart(p, "vmware", &opts)) { - cirrus_vga_enabled = 0; - std_vga_enabled = 0; vmsvga_enabled = 1; - } else if (strstart(p, "none", &opts)) { - cirrus_vga_enabled = 0; - std_vga_enabled = 0; - vmsvga_enabled = 0; - } else { + } else if (!strstart(p, "none", &opts)) { invalid_vga: fprintf(stderr, "Unknown vga type: %s\n", p); exit(1); -- 1.6.2.2