From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hF0N9-00059P-IY for qemu-devel@nongnu.org; Fri, 12 Apr 2019 13:53:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hF0N7-0007ma-Hx for qemu-devel@nongnu.org; Fri, 12 Apr 2019 13:53:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35198) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hF0N7-0007ln-A3 for qemu-devel@nongnu.org; Fri, 12 Apr 2019 13:53:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8AEDA3B77F for ; Fri, 12 Apr 2019 17:53:51 +0000 (UTC) Date: Fri, 12 Apr 2019 18:53:48 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20190412175347.GP2906@work-vm> References: <20190411152520.10061-1-armbru@redhat.com> <20190411152520.10061-14-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190411152520.10061-14-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH 13/17] qemu-print: New qemu_fprintf(), qemu_vfprintf() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org * Markus Armbruster (armbru@redhat.com) wrote: > Code that doesn't want to know about current monitor vs. stdout > vs. stderr takes an fprintf_function callback and a FILE * argument to > pass to it. Actual arguments are either fprintf() and stdout or > stderr, or monitor_fprintf() and the current monitor cast to FILE *. > monitor_fprintf() casts it right back, and is otherwise identical to > monitor_printf(). The type-punning is ugly. > > New qemu_fprintf() and qemu_vprintf() address this need without type > punning: they are like fprintf() and vfprintf(), except they print to > the current monitor when passed a null FILE *. The next commits will > put them to use. > > Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert > --- > include/qemu/qemu-print.h | 4 ++++ > util/qemu-print.c | 27 +++++++++++++++++++++++++++ > 2 files changed, 31 insertions(+) > > diff --git a/include/qemu/qemu-print.h b/include/qemu/qemu-print.h > index 8fed32bf42..40b596262f 100644 > --- a/include/qemu/qemu-print.h > +++ b/include/qemu/qemu-print.h > @@ -16,4 +16,8 @@ > int qemu_vprintf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); > int qemu_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2); > > +int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap) > + GCC_FMT_ATTR(2, 0); > +int qemu_fprintf(FILE *stream, const char *fmt, ...) GCC_FMT_ATTR(2, 3); > + > #endif > diff --git a/util/qemu-print.c b/util/qemu-print.c > index 86f9417af8..e79d6b8396 100644 > --- a/util/qemu-print.c > +++ b/util/qemu-print.c > @@ -40,3 +40,30 @@ int qemu_printf(const char *fmt, ...) > va_end(ap); > return ret; > } > + > +/* > + * Print like vfprintf() > + * Print to @stream if non-null, else to current monitor. > + */ > +int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap) > +{ > + if (!stream) { > + return monitor_vprintf(cur_mon, fmt, ap); > + } > + return vfprintf(stream, fmt, ap); > +} > + > +/* > + * Print like fprintf(). > + * Print to @stream if non-null, else to current monitor. > + */ > +int qemu_fprintf(FILE *stream, const char *fmt, ...) > +{ > + va_list ap; > + int ret; > + > + va_start(ap, fmt); > + ret = qemu_vfprintf(stream, fmt, ap); > + va_end(ap); > + return ret; > +} > -- > 2.17.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK