From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atBix-0003cH-Ux for qemu-devel@nongnu.org; Thu, 21 Apr 2016 06:20:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atBit-0007eE-Lh for qemu-devel@nongnu.org; Thu, 21 Apr 2016 06:20:39 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:33514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atBis-0007dz-Sz for qemu-devel@nongnu.org; Thu, 21 Apr 2016 06:20:35 -0400 Received: by mail-wm0-x22b.google.com with SMTP id 127so2605028wmz.0 for ; Thu, 21 Apr 2016 03:20:34 -0700 (PDT) References: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> <1460147350-7601-4-git-send-email-pbonzini@redhat.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1460147350-7601-4-git-send-email-pbonzini@redhat.com> Date: Thu, 21 Apr 2016 11:20:32 +0100 Message-ID: <8760vbuutr.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 03/50] log: do not use CONFIG_USER_ONLY List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org Paolo Bonzini writes: > This decouples logging further from config-target.h > > Signed-off-by: Paolo Bonzini Reviewed-by: Alex Bennée > --- > bsd-user/main.c | 1 + > include/qemu/log.h | 17 ++--------------- > linux-user/main.c | 1 + > util/log.c | 12 ++++++++++-- > 4 files changed, 14 insertions(+), 17 deletions(-) > > diff --git a/bsd-user/main.c b/bsd-user/main.c > index 27854c1..058eaca 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -849,6 +849,7 @@ int main(int argc, char **argv) > } > > /* init debug */ > + qemu_log_needs_buffers(); > qemu_set_log_filename(log_file); > if (log_mask) { > int mask; > diff --git a/include/qemu/log.h b/include/qemu/log.h > index c52f136..234fa81 100644 > --- a/include/qemu/log.h > +++ b/include/qemu/log.h > @@ -104,21 +104,8 @@ typedef struct QEMULogItem { > > extern const QEMULogItem qemu_log_items[]; > > -/* This is the function that actually does the work of > - * changing the log level; it should only be accessed via > - * 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(int log_flags); > +void qemu_log_needs_buffers(void); > void qemu_set_log_filename(const char *filename); > void qemu_set_dfilter_ranges(const char *ranges); > bool qemu_log_in_addr_range(uint64_t addr); > diff --git a/linux-user/main.c b/linux-user/main.c > index 5f3ec97..2b7fa9c 100644 > --- a/linux-user/main.c > +++ b/linux-user/main.c > @@ -3760,6 +3760,7 @@ static void handle_arg_log(const char *arg) > qemu_print_log_usage(stdout); > exit(EXIT_FAILURE); > } > + qemu_log_needs_buffers(); > qemu_set_log(mask); > } > > diff --git a/util/log.c b/util/log.c > index 1857730..5ad72c1 100644 > --- a/util/log.c > +++ b/util/log.c > @@ -42,8 +42,10 @@ void qemu_log(const char *fmt, ...) > va_end(ap); > } > > +static bool log_uses_own_buffers; > + > /* 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; > #ifdef CONFIG_TRACE_LOG > @@ -70,7 +72,7 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers) > qemu_logfile = stderr; > } > /* 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]; > > 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(); > } > } > + > +void qemu_log_needs_buffers(void) > +{ > + log_uses_own_buffers = true; > +} > + > /* > * Allow the user to include %d in their logfile which will be > * substituted with the current PID. This is useful for debugging many -- Alex Bennée