From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwanU-0003Ev-25 for qemu-devel@nongnu.org; Wed, 11 Nov 2015 14:11:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwanS-0006ha-Na for qemu-devel@nongnu.org; Wed, 11 Nov 2015 14:11:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwanS-0006hT-Hn for qemu-devel@nongnu.org; Wed, 11 Nov 2015 14:11:06 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 27F997F340 for ; Wed, 11 Nov 2015 19:11:06 +0000 (UTC) From: Eduardo Habkost Date: Wed, 11 Nov 2015 17:09:14 -0200 Message-Id: <1447268956-27500-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1447268956-27500-1-git-send-email-ehabkost@redhat.com> References: <1447268956-27500-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 10/12] vl: Make display_type a local variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini 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 f92a53c..917f327 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 5d0228b..915fa29 100644 --- a/vl.c +++ b/vl.c @@ -132,7 +132,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; @@ -2981,6 +2980,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; const char *trace_events = NULL; -- 2.1.0