Commit dbed7e40f62d359e2a59da724ca8da7143a3b075
1 parent
7ca699c8
Make some variables static
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5377 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
14 additions
and
14 deletions
vl.c
... | ... | @@ -166,20 +166,20 @@ |
166 | 166 | |
167 | 167 | const char *bios_dir = CONFIG_QEMU_SHAREDIR; |
168 | 168 | const char *bios_name = NULL; |
169 | -void *ioport_opaque[MAX_IOPORTS]; | |
170 | -IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS]; | |
171 | -IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS]; | |
169 | +static void *ioport_opaque[MAX_IOPORTS]; | |
170 | +static IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS]; | |
171 | +static IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS]; | |
172 | 172 | /* Note: drives_table[MAX_DRIVES] is a dummy block driver if none available |
173 | 173 | to store the VM snapshots */ |
174 | 174 | DriveInfo drives_table[MAX_DRIVES+1]; |
175 | 175 | int nb_drives; |
176 | 176 | /* point to the block driver where the snapshots are managed */ |
177 | -BlockDriverState *bs_snapshots; | |
178 | -int vga_ram_size; | |
177 | +static BlockDriverState *bs_snapshots; | |
178 | +static int vga_ram_size; | |
179 | 179 | enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; |
180 | 180 | static DisplayState display_state; |
181 | 181 | int nographic; |
182 | -int curses; | |
182 | +static int curses; | |
183 | 183 | const char* keyboard_layout = NULL; |
184 | 184 | int64_t ticks_per_sec; |
185 | 185 | ram_addr_t ram_size; |
... | ... | @@ -199,8 +199,8 @@ int graphic_width = 800; |
199 | 199 | int graphic_height = 600; |
200 | 200 | int graphic_depth = 15; |
201 | 201 | #endif |
202 | -int full_screen = 0; | |
203 | -int no_frame = 0; | |
202 | +static int full_screen = 0; | |
203 | +static int no_frame = 0; | |
204 | 204 | int no_quit = 0; |
205 | 205 | CharDriverState *serial_hds[MAX_SERIAL_PORTS]; |
206 | 206 | CharDriverState *parallel_hds[MAX_PARALLEL_PORTS]; |
... | ... | @@ -238,8 +238,8 @@ int alt_grab = 0; |
238 | 238 | unsigned int nb_prom_envs = 0; |
239 | 239 | const char *prom_envs[MAX_PROM_ENVS]; |
240 | 240 | #endif |
241 | -int nb_drives_opt; | |
242 | -struct drive_opt { | |
241 | +static int nb_drives_opt; | |
242 | +static struct drive_opt { | |
243 | 243 | const char *file; |
244 | 244 | char opt[1024]; |
245 | 245 | } drives_opt[MAX_DRIVES]; |
... | ... | @@ -253,8 +253,8 @@ static int icount_time_shift; |
253 | 253 | #define MAX_ICOUNT_SHIFT 10 |
254 | 254 | /* Compensate for varying guest execution speed. */ |
255 | 255 | static int64_t qemu_icount_bias; |
256 | -QEMUTimer *icount_rt_timer; | |
257 | -QEMUTimer *icount_vm_timer; | |
256 | +static QEMUTimer *icount_rt_timer; | |
257 | +static QEMUTimer *icount_vm_timer; | |
258 | 258 | |
259 | 259 | uint8_t qemu_uuid[16]; |
260 | 260 | |
... | ... | @@ -4214,7 +4214,7 @@ static void net_slirp_redir(const char *redir_str) |
4214 | 4214 | |
4215 | 4215 | #ifndef _WIN32 |
4216 | 4216 | |
4217 | -char smb_dir[1024]; | |
4217 | +static char smb_dir[1024]; | |
4218 | 4218 | |
4219 | 4219 | static void erase_dir(char *dir_name) |
4220 | 4220 | { |
... | ... | @@ -8104,7 +8104,7 @@ typedef struct QEMUOption { |
8104 | 8104 | int index; |
8105 | 8105 | } QEMUOption; |
8106 | 8106 | |
8107 | -const QEMUOption qemu_options[] = { | |
8107 | +static const QEMUOption qemu_options[] = { | |
8108 | 8108 | { "h", 0, QEMU_OPTION_h }, |
8109 | 8109 | { "help", 0, QEMU_OPTION_h }, |
8110 | 8110 | ... | ... |