From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgv-0001vi-OI for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIHgg-00067S-OG for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:13 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:42492 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgg-00066G-B0 for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:36:58 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Aug 2014 15:35:53 +0200 Message-Id: <1408109759-1100-22-git-send-email-benoit.canet@nodalink.com> In-Reply-To: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> References: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 21/26] monitor-system: Switch back functions to static List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com The move from monitor.c to monitor-system.c is done these functions no lo= nger needs to be public. Signed-off-by: Beno=C3=AEt Canet --- include/monitor/monitor-system.h | 46 -------------------- monitor-system.c | 93 ++++++++++++++++++++--------------= ------ 2 files changed, 47 insertions(+), 92 deletions(-) diff --git a/include/monitor/monitor-system.h b/include/monitor/monitor-s= ystem.h index af6dc54..e7b99ce 100644 --- a/include/monitor/monitor-system.h +++ b/include/monitor/monitor-system.h @@ -96,50 +96,4 @@ typedef struct MonitorCommand { int get_expr(Monitor *mon, int64_t *pval, const char **pp); int get_double(Monitor *mon, double *pval, const char **pp); =20 -int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, - const char *fmt, ...); -void help_cmd(Monitor *mon, const char *name); -void do_help_cmd(Monitor *mon, const QDict *qdict); -void do_trace_event_set_state(Monitor *mon, const QDict *qdict); -void do_trace_file(Monitor *mon, const QDict *qdict); -void do_info_help(Monitor *mon, const QDict *qdict); - -void do_info_registers(Monitor *mon, const QDict *qdict); -void do_info_jit(Monitor *mon, const QDict *qdict); -void do_info_history(Monitor *mon, const QDict *qdict); -void tlb_info(Monitor *mon, const QDict *qdict); -void mem_info(Monitor *mon, const QDict *qdict); -void do_info_mtree(Monitor *mon, const QDict *qdict); -void do_info_numa(Monitor *mon, const QDict *qdict); -void do_info_profile(Monitor *mon, const QDict *qdict); -void do_info_capture(Monitor *mon, const QDict *qdict); -void do_info_cpu_stats(Monitor *mon, const QDict *qdict); -void do_trace_print_events(Monitor *mon, const QDict *qdict); -void do_logfile(Monitor *mon, const QDict *qdict); -void do_log(Monitor *mon, const QDict *qdict); -void do_singlestep(Monitor *mon, const QDict *qdict); -void do_gdbserver(Monitor *mon, const QDict *qdict); -void do_memory_dump(Monitor *mon, const QDict *qdict); -void do_physical_memory_dump(Monitor *mon, const QDict *qdict); -void do_print(Monitor *mon, const QDict *qdict); -void do_ioport_read(Monitor *mon, const QDict *qdict); -void do_ioport_write(Monitor *mon, const QDict *qdict); -void do_sum(Monitor *mon, const QDict *qdict); -void do_mouse_move(Monitor *mon, const QDict *qdict); -void do_mouse_button(Monitor *mon, const QDict *qdict); -void do_wav_capture(Monitor *mon, const QDict *qdict); -void do_stop_capture(Monitor *mon, const QDict *qdict); -void do_boot_set(Monitor *mon, const QDict *qdict); -int client_migrate_info(Monitor *mon, const QDict *qdict, - MonitorCompletion cb, void *opaque); -void do_watchdog_action(Monitor *mon, const QDict *qdict); -void do_acl_show(Monitor *mon, const QDict *qdict); -void do_acl_policy(Monitor *mon, const QDict *qdict); -void do_acl_add(Monitor *mon, const QDict *qdict); -void do_acl_remove(Monitor *mon, const QDict *qdict); -void do_acl_reset(Monitor *mon, const QDict *qdict); -void do_inject_mce(Monitor *mon, const QDict *qdict); -CPUArchState *mon_get_cpu(void); -void do_loadvm(Monitor *mon, const QDict *qdict); - #endif diff --git a/monitor-system.c b/monitor-system.c index ca0d0ff..bc5e8f4 100644 --- a/monitor-system.c +++ b/monitor-system.c @@ -58,8 +58,8 @@ =20 extern const char *monitor_event_names[]; =20 -int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, - const char *fmt, ...) +static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, + const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -154,7 +154,7 @@ static void help_cmd_dump(Monitor *mon, const Monitor= Command *cmds, } } =20 -void help_cmd(Monitor *mon, const char *name) +static void help_cmd(Monitor *mon, const char *name) { char *args[MAX_ARGS]; int nb_args =3D 0; @@ -183,12 +183,12 @@ void help_cmd(Monitor *mon, const char *name) free_cmdline_args(args, nb_args); } =20 -void do_help_cmd(Monitor *mon, const QDict *qdict) +static void do_help_cmd(Monitor *mon, const QDict *qdict) { help_cmd(mon, qdict_get_try_str(qdict, "name")); } =20 -void do_trace_event_set_state(Monitor *mon, const QDict *qdict) +static void do_trace_event_set_state(Monitor *mon, const QDict *qdict) { const char *tp_name =3D qdict_get_str(qdict, "name"); bool new_state =3D qdict_get_bool(qdict, "option"); @@ -209,7 +209,7 @@ void do_trace_event_set_state(Monitor *mon, const QDi= ct *qdict) } =20 #ifdef CONFIG_TRACE_SIMPLE -void do_trace_file(Monitor *mon, const QDict *qdict) +static void do_trace_file(Monitor *mon, const QDict *qdict) { const char *op =3D qdict_get_try_str(qdict, "op"); const char *arg =3D qdict_get_try_str(qdict, "arg"); @@ -233,7 +233,7 @@ void do_trace_file(Monitor *mon, const QDict *qdict) } #endif =20 -void do_info_help(Monitor *mon, const QDict *qdict) +static void do_info_help(Monitor *mon, const QDict *qdict) { help_cmd(mon, "info"); } @@ -251,7 +251,7 @@ int monitor_set_cpu(int cpu_index) return 0; } =20 -CPUArchState *mon_get_cpu(void) +static CPUArchState *mon_get_cpu(void) { if (!cur_mon->mon_cpu) { monitor_set_cpu(0); @@ -266,7 +266,7 @@ int monitor_get_cpu_index(void) return cpu->cpu_index; } =20 -void do_info_registers(Monitor *mon, const QDict *qdict) +static void do_info_registers(Monitor *mon, const QDict *qdict) { CPUState *cpu; CPUArchState *env; @@ -275,13 +275,13 @@ void do_info_registers(Monitor *mon, const QDict *q= dict) cpu_dump_state(cpu, (FILE *)mon, monitor_fprintf, CPU_DUMP_FPU); } =20 -void do_info_jit(Monitor *mon, const QDict *qdict) +static void do_info_jit(Monitor *mon, const QDict *qdict) { dump_exec_info((FILE *)mon, monitor_fprintf); dump_drift_info((FILE *)mon, monitor_fprintf); } =20 -void do_info_history(Monitor *mon, const QDict *qdict) +static void do_info_history(Monitor *mon, const QDict *qdict) { int i; const char *str; @@ -298,7 +298,7 @@ void do_info_history(Monitor *mon, const QDict *qdict= ) } } =20 -void do_info_cpu_stats(Monitor *mon, const QDict *qdict) +static void do_info_cpu_stats(Monitor *mon, const QDict *qdict) { CPUState *cpu; CPUArchState *env; @@ -308,12 +308,12 @@ void do_info_cpu_stats(Monitor *mon, const QDict *q= dict) cpu_dump_statistics(cpu, (FILE *)mon, &monitor_fprintf, 0); } =20 -void do_trace_print_events(Monitor *mon, const QDict *qdict) +static void do_trace_print_events(Monitor *mon, const QDict *qdict) { trace_print_events((FILE *)mon, &monitor_fprintf); } =20 -int client_migrate_info(Monitor *mon, const QDict *qdict, +static int client_migrate_info(Monitor *mon, const QDict *qdict, MonitorCompletion cb, void *opaque) { const char *protocol =3D qdict_get_str(qdict, "protocol"); @@ -347,12 +347,12 @@ int client_migrate_info(Monitor *mon, const QDict *= qdict, return -1; } =20 -void do_logfile(Monitor *mon, const QDict *qdict) +static void do_logfile(Monitor *mon, const QDict *qdict) { qemu_set_log_filename(qdict_get_str(qdict, "filename")); } =20 -void do_log(Monitor *mon, const QDict *qdict) +static void do_log(Monitor *mon, const QDict *qdict) { int mask; const char *items =3D qdict_get_str(qdict, "items"); @@ -369,7 +369,7 @@ void do_log(Monitor *mon, const QDict *qdict) qemu_set_log(mask); } =20 -void do_singlestep(Monitor *mon, const QDict *qdict) +static void do_singlestep(Monitor *mon, const QDict *qdict) { const char *option =3D qdict_get_try_str(qdict, "option"); if (!option || !strcmp(option, "on")) { @@ -381,7 +381,7 @@ void do_singlestep(Monitor *mon, const QDict *qdict) } } =20 -void do_gdbserver(Monitor *mon, const QDict *qdict) +static void do_gdbserver(Monitor *mon, const QDict *qdict) { const char *device =3D qdict_get_try_str(qdict, "device"); if (!device) @@ -397,7 +397,7 @@ void do_gdbserver(Monitor *mon, const QDict *qdict) } } =20 -void do_watchdog_action(Monitor *mon, const QDict *qdict) +static void do_watchdog_action(Monitor *mon, const QDict *qdict) { const char *action =3D qdict_get_str(qdict, "action"); if (select_watchdog_action(action) =3D=3D -1) { @@ -556,7 +556,7 @@ static void memory_dump(Monitor *mon, int count, int = format, int wsize, } } =20 -void do_memory_dump(Monitor *mon, const QDict *qdict) +static void do_memory_dump(Monitor *mon, const QDict *qdict) { int count =3D qdict_get_int(qdict, "count"); int format =3D qdict_get_int(qdict, "format"); @@ -566,7 +566,7 @@ void do_memory_dump(Monitor *mon, const QDict *qdict) memory_dump(mon, count, format, size, addr, 0); } =20 -void do_physical_memory_dump(Monitor *mon, const QDict *qdict) +static void do_physical_memory_dump(Monitor *mon, const QDict *qdict) { int count =3D qdict_get_int(qdict, "count"); int format =3D qdict_get_int(qdict, "format"); @@ -576,7 +576,7 @@ void do_physical_memory_dump(Monitor *mon, const QDic= t *qdict) memory_dump(mon, count, format, size, addr, 1); } =20 -void do_print(Monitor *mon, const QDict *qdict) +static void do_print(Monitor *mon, const QDict *qdict) { int format =3D qdict_get_int(qdict, "format"); hwaddr val =3D qdict_get_int(qdict, "val"); @@ -602,7 +602,7 @@ void do_print(Monitor *mon, const QDict *qdict) monitor_printf(mon, "\n"); } =20 -void do_sum(Monitor *mon, const QDict *qdict) +static void do_sum(Monitor *mon, const QDict *qdict) { uint32_t addr; uint16_t sum; @@ -621,7 +621,7 @@ void do_sum(Monitor *mon, const QDict *qdict) =20 static int mouse_button_state; =20 -void do_mouse_move(Monitor *mon, const QDict *qdict) +static void do_mouse_move(Monitor *mon, const QDict *qdict) { int dx, dy, dz, button; const char *dx_str =3D qdict_get_str(qdict, "dx_str"); @@ -645,7 +645,7 @@ void do_mouse_move(Monitor *mon, const QDict *qdict) qemu_input_event_sync(); } =20 -void do_mouse_button(Monitor *mon, const QDict *qdict) +static void do_mouse_button(Monitor *mon, const QDict *qdict) { static uint32_t bmap[INPUT_BUTTON_MAX] =3D { [INPUT_BUTTON_LEFT] =3D MOUSE_EVENT_LBUTTON, @@ -662,7 +662,7 @@ void do_mouse_button(Monitor *mon, const QDict *qdict= ) mouse_button_state =3D button_state; } =20 -void do_ioport_read(Monitor *mon, const QDict *qdict) +static void do_ioport_read(Monitor *mon, const QDict *qdict) { int size =3D qdict_get_int(qdict, "size"); int addr =3D qdict_get_int(qdict, "addr"); @@ -696,7 +696,7 @@ void do_ioport_read(Monitor *mon, const QDict *qdict) suffix, addr, size * 2, val); } =20 -void do_ioport_write(Monitor *mon, const QDict *qdict) +static void do_ioport_write(Monitor *mon, const QDict *qdict) { int size =3D qdict_get_int(qdict, "size"); int addr =3D qdict_get_int(qdict, "addr"); @@ -718,7 +718,7 @@ void do_ioport_write(Monitor *mon, const QDict *qdict= ) } } =20 -void do_boot_set(Monitor *mon, const QDict *qdict) +static void do_boot_set(Monitor *mon, const QDict *qdict) { int res; const char *bootdevice =3D qdict_get_str(qdict, "bootdevice"); @@ -884,7 +884,7 @@ static void tlb_info_64(Monitor *mon, CPUArchState *e= nv) } #endif =20 -void tlb_info(Monitor *mon, const QDict *qdict) +static void tlb_info(Monitor *mon, const QDict *qdict) { CPUArchState *env; =20 @@ -1107,7 +1107,7 @@ static void mem_info_64(Monitor *mon, CPUArchState = *env) } #endif =20 -void mem_info(Monitor *mon, const QDict *qdict) +static void mem_info(Monitor *mon, const QDict *qdict) { CPUArchState *env; =20 @@ -1146,8 +1146,9 @@ static void print_tlb(Monitor *mon, int idx, tlb_t = *tlb) tlb->d, tlb->wt); } =20 -void tlb_info(Monitor *mon, const QDict *qdict) +static void tlb_info(Monitor *mon, const QDict *qdict) { + CPUArchState *env =3D mon_get_cpu(); int i; =20 @@ -1162,7 +1163,7 @@ void tlb_info(Monitor *mon, const QDict *qdict) #endif =20 #if defined(TARGET_SPARC) || defined(TARGET_PPC) || defined(TARGET_XTENS= A) -void tlb_info(Monitor *mon, const QDict *qdict) +static void tlb_info(Monitor *mon, const QDict *qdict) { CPUArchState *env1 =3D mon_get_cpu(); =20 @@ -1170,12 +1171,12 @@ void tlb_info(Monitor *mon, const QDict *qdict) } #endif =20 -void do_info_mtree(Monitor *mon, const QDict *qdict) +static void do_info_mtree(Monitor *mon, const QDict *qdict) { mtree_info((fprintf_function)monitor_printf, mon); } =20 -void do_info_numa(Monitor *mon, const QDict *qdict) +static void do_info_numa(Monitor *mon, const QDict *qdict) { int i; CPUState *cpu; @@ -1199,7 +1200,7 @@ void do_info_numa(Monitor *mon, const QDict *qdict) int64_t qemu_time; int64_t dev_time; =20 -void do_info_profile(Monitor *mon, const QDict *qdict) +static void do_info_profile(Monitor *mon, const QDict *qdict) { monitor_printf(mon, "async time %" PRId64 " (%0.3f)\n", dev_time, dev_time / (double)get_ticks_per_sec()); @@ -1209,7 +1210,7 @@ void do_info_profile(Monitor *mon, const QDict *qdi= ct) dev_time =3D 0; } #else -void do_info_profile(Monitor *mon, const QDict *qdict) +static void do_info_profile(Monitor *mon, const QDict *qdict) { monitor_printf(mon, "Internal profiler not compiled\n"); } @@ -1218,7 +1219,7 @@ void do_info_profile(Monitor *mon, const QDict *qdi= ct) /* Capture support */ static QLIST_HEAD (capture_list_head, CaptureState) capture_head; =20 -void do_info_capture(Monitor *mon, const QDict *qdict) +static void do_info_capture(Monitor *mon, const QDict *qdict) { int i; CaptureState *s; @@ -1229,7 +1230,7 @@ void do_info_capture(Monitor *mon, const QDict *qdi= ct) } } =20 -void do_stop_capture(Monitor *mon, const QDict *qdict) +static void do_stop_capture(Monitor *mon, const QDict *qdict) { int i; int n =3D qdict_get_int(qdict, "n"); @@ -1245,7 +1246,7 @@ void do_stop_capture(Monitor *mon, const QDict *qdi= ct) } } =20 -void do_wav_capture(Monitor *mon, const QDict *qdict) +static void do_wav_capture(Monitor *mon, const QDict *qdict) { const char *path =3D qdict_get_str(qdict, "path"); int has_freq =3D qdict_haskey(qdict, "freq"); @@ -1280,7 +1281,7 @@ static qemu_acl *find_acl(Monitor *mon, const char = *name) return acl; } =20 -void do_acl_show(Monitor *mon, const QDict *qdict) +static void do_acl_show(Monitor *mon, const QDict *qdict) { const char *aclname =3D qdict_get_str(qdict, "aclname"); qemu_acl *acl =3D find_acl(mon, aclname); @@ -1298,7 +1299,7 @@ void do_acl_show(Monitor *mon, const QDict *qdict) } } =20 -void do_acl_reset(Monitor *mon, const QDict *qdict) +static void do_acl_reset(Monitor *mon, const QDict *qdict) { const char *aclname =3D qdict_get_str(qdict, "aclname"); qemu_acl *acl =3D find_acl(mon, aclname); @@ -1309,7 +1310,7 @@ void do_acl_reset(Monitor *mon, const QDict *qdict) } } =20 -void do_acl_policy(Monitor *mon, const QDict *qdict) +static void do_acl_policy(Monitor *mon, const QDict *qdict) { const char *aclname =3D qdict_get_str(qdict, "aclname"); const char *policy =3D qdict_get_str(qdict, "policy"); @@ -1329,7 +1330,7 @@ void do_acl_policy(Monitor *mon, const QDict *qdict= ) } } =20 -void do_acl_add(Monitor *mon, const QDict *qdict) +static void do_acl_add(Monitor *mon, const QDict *qdict) { const char *aclname =3D qdict_get_str(qdict, "aclname"); const char *match =3D qdict_get_str(qdict, "match"); @@ -1360,7 +1361,7 @@ void do_acl_add(Monitor *mon, const QDict *qdict) } } =20 -void do_acl_remove(Monitor *mon, const QDict *qdict) +static void do_acl_remove(Monitor *mon, const QDict *qdict) { const char *aclname =3D qdict_get_str(qdict, "aclname"); const char *match =3D qdict_get_str(qdict, "match"); @@ -1377,7 +1378,7 @@ void do_acl_remove(Monitor *mon, const QDict *qdict= ) } =20 #if defined(TARGET_I386) -void do_inject_mce(Monitor *mon, const QDict *qdict) +static void do_inject_mce(Monitor *mon, const QDict *qdict) { X86CPU *cpu; CPUState *cs; @@ -1401,7 +1402,7 @@ void do_inject_mce(Monitor *mon, const QDict *qdict= ) } #endif =20 -void do_loadvm(Monitor *mon, const QDict *qdict) +static void do_loadvm(Monitor *mon, const QDict *qdict) { int saved_vm_running =3D runstate_is_running(); const char *name =3D qdict_get_str(qdict, "name"); --=20 2.1.0.rc1