From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LweEp-0005TD-0z
	for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LweEo-0005Su-GT
	for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:50 -0400
Received: from [199.232.76.173] (port=45056 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LweEo-0005So-A9
	for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:50 -0400
Received: from savannah.gnu.org ([199.232.41.3]:33625 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LweEo-000411-3v
	for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LweEn-00048E-H7
	for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:19:49 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LweEn-00048A-6q
	for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:19:49 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LweEn-00048A-6q@cvs.savannah.gnu.org>
Date: Wed, 22 Apr 2009 15:19:49 +0000
Subject: [Qemu-devel] [7227] simplify vga selection (Gerd Hoffmann)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 7227
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7227
Author:   aliguori
Date:     2009-04-22 15:19:48 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
simplify vga selection (Gerd Hoffmann)

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2009-04-22 15:19:44 UTC (rev 7226)
+++ trunk/vl.c	2009-04-22 15:19:48 UTC (rev 7227)
@@ -4222,23 +4222,16 @@
 {
     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);