cpus.c: Drop unnecessary set_cpu_log()

The set_cpu_log() function in cpus.c is a fairly simple wrapper
which is only called from one location. Just inline the code
into vl.c, since there is no need to indirect it via cpus.c
and the handling of the error case is more appropriate to vl.c.

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:24 +00:00 committed by Blue Swirl
parent 24537a0191
commit b946bffab5
3 changed files with 8 additions and 14 deletions

12
cpus.c
View file

@ -1175,18 +1175,6 @@ void set_numa_modes(void)
}
}
void set_cpu_log(const char *optarg)
{
int mask;
mask = qemu_str_to_log_mask(optarg);
if (!mask) {
qemu_print_log_usage(stdout);
exit(1);
}
qemu_set_log(mask);
}
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

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

9
vl.c
View file

@ -3864,10 +3864,17 @@ int main(int argc, char **argv, char **envp)
* location or level of logging.
*/
if (log_mask) {
int mask;
if (log_file) {
qemu_set_log_filename(log_file);
}
set_cpu_log(log_mask);
mask = qemu_str_to_log_mask(log_mask);
if (!mask) {
qemu_print_log_usage(stdout);
exit(1);
}
qemu_set_log(mask);
}
if (!trace_backend_init(trace_events, trace_file)) {