From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t8R-0000ua-BF for qemu-devel@nongnu.org; Fri, 20 May 2016 18:43:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3r2t-0001Au-J1 for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3r2t-0001Ap-DX for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:19 -0400 From: Eduardo Habkost Date: Fri, 20 May 2016 17:28:34 -0300 Message-Id: <1463776121-13529-15-git-send-email-ehabkost@redhat.com> In-Reply-To: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> References: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 14/21] vl: Make display_type a local variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , "Michael S. Tsirkin" , Marcel Apfelbaum , qemu-devel@nongnu.org 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 6076b80..7e9f93e 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 35ed954..0d10ceb 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.5.5