motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-31 14:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: do not use CONFIG_USER_ONLY

Browse source 
This decouples logging further from config-target.h

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-12-04 13:12:57 +01:00
parent 4b4629d9d2
commit f2937a33a5
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bsd-user/main.c
View file

@ -849,6 +849,7 @@ int main(int argc, char **argv)
} }
/* init debug */ /* init debug */
qemu_log_needs_buffers();
qemu_set_log_filename(log_file); qemu_set_log_filename(log_file);
if (log_mask) { if (log_mask) {
int mask; int mask;

17
include/qemu/log.h
View file

@ -104,21 +104,8 @@ typedef struct QEMULogItem {
extern const QEMULogItem qemu_log_items[]; extern const QEMULogItem qemu_log_items[];
/* This is the function that actually does the work of void qemu_set_log(int log_flags);
* changing the log level; it should only be accessed via void qemu_log_needs_buffers(void);
* the qemu_set_log() wrapper.
*/
void do_qemu_set_log(int log_flags, bool use_own_buffers);
static inline void qemu_set_log(int log_flags)
{
#ifdef CONFIG_USER_ONLY
do_qemu_set_log(log_flags, true);
#else
do_qemu_set_log(log_flags, false);
#endif
}
void qemu_set_log_filename(const char *filename); void qemu_set_log_filename(const char *filename);
void qemu_set_dfilter_ranges(const char *ranges); void qemu_set_dfilter_ranges(const char *ranges);
bool qemu_log_in_addr_range(uint64_t addr); bool qemu_log_in_addr_range(uint64_t addr);

1
linux-user/main.c
View file

@ -3760,6 +3760,7 @@ static void handle_arg_log(const char *arg)
qemu_print_log_usage(stdout); qemu_print_log_usage(stdout);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
qemu_log_needs_buffers();
qemu_set_log(mask); qemu_set_log(mask);
} }

12
util/log.c
View file

@ -42,8 +42,10 @@ void qemu_log(const char *fmt, ...)
va_end(ap); va_end(ap);
} }
static bool log_uses_own_buffers;
/* enable or disable low levels log */ /* enable or disable low levels log */
void do_qemu_set_log(int log_flags, bool use_own_buffers) void qemu_set_log(int log_flags)
{ {
qemu_loglevel = log_flags; qemu_loglevel = log_flags;
#ifdef CONFIG_TRACE_LOG #ifdef CONFIG_TRACE_LOG
@ -70,7 +72,7 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers)
qemu_logfile = stderr; qemu_logfile = stderr;
} }
/* must avoid mmap() usage of glibc by setting a buffer "by hand" */ /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
if (use_own_buffers) { if (log_uses_own_buffers) {
static char logfile_buf[4096]; static char logfile_buf[4096];
setvbuf(qemu_logfile, logfile_buf, _IOLBF, sizeof(logfile_buf)); setvbuf(qemu_logfile, logfile_buf, _IOLBF, sizeof(logfile_buf));
@ -89,6 +91,12 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers)
qemu_log_close(); qemu_log_close();
} }
} }
void qemu_log_needs_buffers(void)
{
log_uses_own_buffers = true;
}
/* /*
* Allow the user to include %d in their logfile which will be * Allow the user to include %d in their logfile which will be
* substituted with the current PID. This is useful for debugging many * substituted with the current PID. This is useful for debugging many