ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added. 

Signed-off-by: Zachary Amsden <zamsden@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Zachary Amsden 2009-07-30 00:15:02 -10:00 committed by Anthony Liguori
parent 52c18be9e9
commit 861767594b
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sysemu.h
View File

@ -99,10 +99,17 @@ typedef enum DisplayType
extern int autostart; extern int autostart;
extern int bios_size; extern int bios_size;
extern int cirrus_vga_enabled;
extern int std_vga_enabled; typedef enum {
extern int vmsvga_enabled; VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB
extern int xenfb_enabled; } 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_width;
extern int graphic_height; extern int graphic_height;
extern int graphic_depth; extern int graphic_depth;

18
vl.c
View File

@ -191,10 +191,7 @@ int vm_running;
int autostart; int autostart;
static int rtc_utc = 1; static int rtc_utc = 1;
static int rtc_date_offset = -1; /* -1 means no change */ static int rtc_date_offset = -1; /* -1 means no change */
int cirrus_vga_enabled = 1; int vga_interface_type = VGA_CIRRUS;
int std_vga_enabled = 0;
int vmsvga_enabled = 0;
int xenfb_enabled = 0;
#ifdef TARGET_SPARC #ifdef TARGET_SPARC
int graphic_width = 1024; int graphic_width = 1024;
int graphic_height = 768; int graphic_height = 768;
@ -4488,18 +4485,15 @@ static void select_vgahw (const char *p)
{ {
const char *opts; const char *opts;
cirrus_vga_enabled = 0; vga_interface_type = VGA_NONE;
std_vga_enabled = 0;
vmsvga_enabled = 0;
xenfb_enabled = 0;
if (strstart(p, "std", &opts)) { if (strstart(p, "std", &opts)) {
std_vga_enabled = 1; vga_interface_type = VGA_STD;
} else if (strstart(p, "cirrus", &opts)) { } else if (strstart(p, "cirrus", &opts)) {
cirrus_vga_enabled = 1; vga_interface_type = VGA_CIRRUS;
} else if (strstart(p, "vmware", &opts)) { } else if (strstart(p, "vmware", &opts)) {
vmsvga_enabled = 1; vga_interface_type = VGA_VMWARE;
} else if (strstart(p, "xenfb", &opts)) { } else if (strstart(p, "xenfb", &opts)) {
xenfb_enabled = 1; vga_interface_type = VGA_XENFB;
} else if (!strstart(p, "none", &opts)) { } else if (!strstart(p, "none", &opts)) {
invalid_vga: invalid_vga:
fprintf(stderr, "Unknown vga type: %s\n", p); fprintf(stderr, "Unknown vga type: %s\n", p);