From d29345d011114b90f0a6871fb0d46a7741c6c33c Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 19 Apr 2016 16:55:26 -0300 Subject: [PATCH] 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 --- include/sysemu/sysemu.h | 1 - vl.c | 2 +- 2 files changed, 1 insertion(+), 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; -- 2.11.4.GIT