qemu-log: Unify {cpu_set,set_cpu}_log_filename as qemu_set_log_filename

The qemu_log() functionality is no longer specific to TCG CPU debug logs.
Rename cpu_set_log_filename() to qemu_set_log_filename() and drop the
pointless wrapper set_cpu_log_filename().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Peter Maydell 2013-02-11 16:41:20 +00:00 committed by Blue Swirl
parent 5e5f07e08f
commit 9a7e542429
8 changed files with 7 additions and 13 deletions

View File

@ -861,7 +861,7 @@ int main(int argc, char **argv)
}
/* init debug */
cpu_set_log_filename(log_file);
qemu_set_log_filename(log_file);
if (log_mask) {
int mask;
const CPULogItem *item;

5
cpus.c
View File

@ -1191,11 +1191,6 @@ void set_cpu_log(const char *optarg)
cpu_set_log(mask);
}
void set_cpu_log_filename(const char *optarg)
{
cpu_set_log_filename(optarg);
}
void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg)
{
/* XXX: implement xxx_cpu_list for targets that still miss it */

View File

@ -154,7 +154,7 @@ static inline void cpu_set_log(int log_flags)
#endif
}
void cpu_set_log_filename(const char *filename);
void qemu_set_log_filename(const char *filename);
int cpu_str_to_log_mask(const char *str);
#endif

View File

@ -25,7 +25,6 @@ extern int smp_threads;
void set_numa_modes(void);
void set_cpu_log(const char *optarg);
void set_cpu_log_filename(const char *optarg);
void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg);
#endif

View File

@ -3113,7 +3113,7 @@ static void handle_arg_log(const char *arg)
static void handle_arg_log_filename(const char *arg)
{
cpu_set_log_filename(arg);
qemu_set_log_filename(arg);
}
static void handle_arg_set_env(const char *arg)
@ -3480,7 +3480,7 @@ int main(int argc, char **argv, char **envp)
#endif
/* init debug */
cpu_set_log_filename(log_file);
qemu_set_log_filename(log_file);
optind = parse_args(argc, argv);
/* Zero out regs */

View File

@ -964,7 +964,7 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict,
static void do_logfile(Monitor *mon, const QDict *qdict)
{
cpu_set_log_filename(qdict_get_str(qdict, "filename"));
qemu_set_log_filename(qdict_get_str(qdict, "filename"));
}
static void do_log(Monitor *mon, const QDict *qdict)

View File

@ -86,7 +86,7 @@ void qemu_set_log(int log_flags, bool use_own_buffers)
}
}
void cpu_set_log_filename(const char *filename)
void qemu_set_log_filename(const char *filename)
{
g_free(logfilename);
logfilename = g_strdup(filename);

2
vl.c
View File

@ -3865,7 +3865,7 @@ int main(int argc, char **argv, char **envp)
*/
if (log_mask) {
if (log_file) {
set_cpu_log_filename(log_file);
qemu_set_log_filename(log_file);
}
set_cpu_log(log_mask);
}