From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afTVB-0001BI-1o for qemu-devel@nongnu.org; Mon, 14 Mar 2016 10:29:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afTV8-000073-A4 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 10:29:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afTV8-00006z-54 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 10:29:42 -0400 References: <1457954501-26528-1-git-send-email-den@openvz.org> <1457954501-26528-5-git-send-email-den@openvz.org> From: Paolo Bonzini Message-ID: <56E6CAD2.4060302@redhat.com> Date: Mon, 14 Mar 2016 15:29:38 +0100 MIME-Version: 1.0 In-Reply-To: <1457954501-26528-5-git-send-email-den@openvz.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/9] log: move qemu_log_close/qemu_log_flush from header to log.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: qemu-devel@nongnu.org, Stefan Hajnoczi On 14/03/2016 12:21, Denis V. Lunev wrote: > There is no particular reason to keep these functions in the header. > Suggested by Paolo. > > Signed-off-by: Denis V. Lunev > CC: Stefan Hajnoczi > CC: Paolo Bonzini > --- > include/qemu/log.h | 26 +++++--------------------- > util/log.c | 21 +++++++++++++++++++++ > 2 files changed, 26 insertions(+), 21 deletions(-) > > diff --git a/include/qemu/log.h b/include/qemu/log.h > index be20811..2c2c220 100644 > --- a/include/qemu/log.h > +++ b/include/qemu/log.h > @@ -73,27 +73,6 @@ void GCC_FMT_ATTR(2, 3) qemu_log_mask(int mask, const char *fmt, ...); > > /* Maintenance: */ > > -/* fflush() the log file */ > -static inline void qemu_log_flush(void) > -{ > - fflush(qemu_logfile); > -} > - > -/* Close the log file */ > -static inline void qemu_log_close(void) > -{ > - if (qemu_logfile) { > - if (qemu_logfile != stderr) { > - fclose(qemu_logfile); > - } > - qemu_logfile = NULL; > - } > - > - if (is_daemonized()) { > - dup2(STDOUT_FILENO, STDERR_FILENO); /* dup /dev/null to stderr */ > - } > -} > - > /* define log items */ > typedef struct QEMULogItem { > int mask; > @@ -126,4 +105,9 @@ int qemu_str_to_log_mask(const char *str); > */ > void qemu_print_log_usage(FILE *f); > > +/* fflush() the log file */ > +void qemu_log_flush(void); > +/* Close the log file */ > +void qemu_log_close(void); > + > #endif > diff --git a/util/log.c b/util/log.c > index a06aa14..df672cc 100644 > --- a/util/log.c > +++ b/util/log.c > @@ -99,6 +99,27 @@ void qemu_set_log_filename(const char *filename) > qemu_set_log(qemu_loglevel); > } > > +/* fflush() the log file */ > +void qemu_log_flush(void) > +{ > + fflush(qemu_logfile); > +} > + > +/* Close the log file */ > +void qemu_log_close(void) > +{ > + if (qemu_logfile) { > + if (qemu_logfile != stderr) { > + fclose(qemu_logfile); > + } > + qemu_logfile = NULL; > + } > + > + if (is_daemonized()) { > + dup2(STDOUT_FILENO, STDERR_FILENO); /* dup /dev/null to stderr */ > + } > +} > + > const QEMULogItem qemu_log_items[] = { > { CPU_LOG_TB_OUT_ASM, "out_asm", > "show generated host assembly code for each compiled TB" }, > Looks good, but it depends on patch 3. It's always better to put the obvious/uncontroversial patches first. Paolo