From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWSje-0005B4-Ut for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWSja-00057X-9Z for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:42 -0400 Received: from [199.232.76.173] (port=34906 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWSjZ-00057L-TO for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:37 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41335) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWSjZ-0008C2-Bl for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:37 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6UAJa6p002759 for ; Thu, 30 Jul 2009 06:19:36 -0400 From: Zachary Amsden Date: Thu, 30 Jul 2009 00:15:02 -1000 Message-Id: <1248948912-7877-5-git-send-email-zamsden@redhat.com> In-Reply-To: <1248948912-7877-4-git-send-email-zamsden@redhat.com> References: <1248948912-7877-1-git-send-email-zamsden@redhat.com> <1248948912-7877-2-git-send-email-zamsden@redhat.com> <1248948912-7877-3-git-send-email-zamsden@redhat.com> <1248948912-7877-4-git-send-email-zamsden@redhat.com> Subject: [Qemu-devel] [PATCH 04/14] Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zamsden@redhat.com Signed-off-by: Zachary Amsden --- sysemu.h | 15 +++++++++++---- vl.c | 18 ++++++------------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sysemu.h b/sysemu.h index d77de09..f0e8d22 100644 --- a/sysemu.h +++ b/sysemu.h @@ -103,10 +103,17 @@ typedef enum DisplayType } DisplayType; extern int bios_size; -extern int cirrus_vga_enabled; -extern int std_vga_enabled; -extern int vmsvga_enabled; -extern int xenfb_enabled; + +typedef enum { + VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB +} VGAInterfaceType; + +extern int vga_interface_type; +#define cirrus_vga_enabled (vga_interface_type == VGA_CIRRUS) +#define std_vga_enabled (vga_interface_type == VGA_STD) +#define xenfb_enabled (vga_interface_type == VGA_XENFB) +#define vmsvga_enabled (vga_interface_type == VGA_VMWARE) + extern int graphic_width; extern int graphic_height; extern int graphic_depth; diff --git a/vl.c b/vl.c index 60a00e1..f9d2da6 100644 --- a/vl.c +++ b/vl.c @@ -213,10 +213,7 @@ int vm_running; static int autostart; static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */ -int cirrus_vga_enabled = 1; -int std_vga_enabled = 0; -int vmsvga_enabled = 0; -int xenfb_enabled = 0; +int vga_interface_type = VGA_CIRRUS; #ifdef TARGET_SPARC int graphic_width = 1024; int graphic_height = 768; @@ -4737,18 +4734,15 @@ static void select_vgahw (const char *p) { const char *opts; - cirrus_vga_enabled = 0; - std_vga_enabled = 0; - vmsvga_enabled = 0; - xenfb_enabled = 0; + vga_interface_type = VGA_NONE; if (strstart(p, "std", &opts)) { - std_vga_enabled = 1; + vga_interface_type = VGA_STD; } else if (strstart(p, "cirrus", &opts)) { - cirrus_vga_enabled = 1; + vga_interface_type = VGA_CIRRUS; } else if (strstart(p, "vmware", &opts)) { - vmsvga_enabled = 1; + vga_interface_type = VGA_VMWARE; } else if (strstart(p, "xenfb", &opts)) { - xenfb_enabled = 1; + vga_interface_type = VGA_XENFB; } else if (!strstart(p, "none", &opts)) { invalid_vga: fprintf(stderr, "Unknown vga type: %s\n", p); -- 1.6.2.5