aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-04-19 16:55:26 -0300
committerEduardo Habkost <ehabkost@redhat.com>2016-05-20 14:28:54 -0300
commitd29345d011114b90f0a6871fb0d46a7741c6c33c (patch)
treee1684dfa2ca418808d37843357425a75e10f6a0c
parentcfc58cf37362a931990efc75f3f580dfec49ac1e (diff)
vl: Make display_type a local variable
Now display_type is only used inside main(), and don't need to be a global variable. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--include/sysemu/sysemu.h1
-rw-r--r--vl.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 6076b80048..7e9f93ebb1 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -155,7 +155,6 @@ extern int vga_interface_type;
extern int graphic_width;
extern int graphic_height;
extern int graphic_depth;
-extern DisplayType display_type;
extern int display_opengl;
extern const char *keyboard_layout;
extern int win2k_install_hack;
diff --git a/vl.c b/vl.c
index 35ed954780..0d10ceb011 100644
--- a/vl.c
+++ b/vl.c
@@ -129,7 +129,6 @@ static const char *data_dir[16];
static int data_dir_idx;
const char *bios_name = NULL;
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
-DisplayType display_type = DT_DEFAULT;
int request_opengl = -1;
int display_opengl;
static int display_remote;
@@ -2963,6 +2962,7 @@ int main(int argc, char **argv, char **envp)
bool defconfig = true;
bool userconfig = true;
bool nographic = false;
+ DisplayType display_type = DT_DEFAULT;
const char *log_mask = NULL;
const char *log_file = NULL;
char *trace_file = NULL;