diff options
| -rw-r--r-- | sysemu.h | 5 | ||||
| -rw-r--r-- | vl.c | 21 |
2 files changed, 12 insertions, 14 deletions
@@ -19,7 +19,6 @@ extern uint8_t qemu_uuid[]; int qemu_uuid_parse(const char *str, uint8_t *uuid); #define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" -void runstate_init(void); bool runstate_check(RunState state); void runstate_set(RunState new_state); int runstate_is_running(void); @@ -57,11 +56,7 @@ void qemu_system_debug_request(void); void qemu_system_vmstop_request(RunState reason); int qemu_shutdown_requested_get(void); int qemu_reset_requested_get(void); -int qemu_shutdown_requested(void); -int qemu_reset_requested(void); -int qemu_powerdown_requested(void); void qemu_system_killed(int signal, pid_t pid); -void qemu_kill_report(void); void qemu_devices_reset(void); void qemu_system_reset(bool report); @@ -180,7 +180,7 @@ static const char *data_dir; const char *bios_name = NULL; enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; DisplayType display_type = DT_DEFAULT; -int display_remote = 0; +static int display_remote; const char* keyboard_layout = NULL; ram_addr_t ram_size; const char *mem_path = NULL; @@ -214,7 +214,7 @@ const char *vnc_display; int acpi_enabled = 1; int no_hpet = 0; int fd_bootchk = 1; -int no_reboot = 0; +static int no_reboot; int no_shutdown = 0; int cursor_hide = 1; int graphic_rotate = 0; @@ -242,7 +242,8 @@ struct FWBootEntry { char *suffix; }; -QTAILQ_HEAD(, FWBootEntry) fw_boot_order = QTAILQ_HEAD_INITIALIZER(fw_boot_order); +static QTAILQ_HEAD(, FWBootEntry) fw_boot_order = + QTAILQ_HEAD_INITIALIZER(fw_boot_order); int nb_numa_nodes; uint64_t node_mem[MAX_NODES]; @@ -396,7 +397,7 @@ bool runstate_check(RunState state) return current_run_state == state; } -void runstate_init(void) +static void runstate_init(void) { const RunStateTransition *p; @@ -1457,14 +1458,14 @@ int qemu_reset_requested_get(void) return reset_requested; } -int qemu_shutdown_requested(void) +static int qemu_shutdown_requested(void) { int r = shutdown_requested; shutdown_requested = 0; return r; } -void qemu_kill_report(void) +static void qemu_kill_report(void) { if (!qtest_enabled() && shutdown_signal != -1) { fprintf(stderr, "qemu: terminating on signal %d", shutdown_signal); @@ -1480,7 +1481,7 @@ void qemu_kill_report(void) } } -int qemu_reset_requested(void) +static int qemu_reset_requested(void) { int r = reset_requested; reset_requested = 0; @@ -1501,7 +1502,7 @@ static int qemu_wakeup_requested(void) return r; } -int qemu_powerdown_requested(void) +static int qemu_powerdown_requested(void) { int r = powerdown_requested; powerdown_requested = 0; @@ -2127,7 +2128,9 @@ struct device_config { Location loc; QTAILQ_ENTRY(device_config) next; }; -QTAILQ_HEAD(, device_config) device_configs = QTAILQ_HEAD_INITIALIZER(device_configs); + +static QTAILQ_HEAD(, device_config) device_configs = + QTAILQ_HEAD_INITIALIZER(device_configs); static void add_device_config(int type, const char *cmdline) { |