From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:52362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDv2x-0001wP-0X for qemu-devel@nongnu.org; Tue, 09 Apr 2019 14:00:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDv2v-0000wI-Nf for qemu-devel@nongnu.org; Tue, 09 Apr 2019 14:00:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDv2v-0000vk-AM for qemu-devel@nongnu.org; Tue, 09 Apr 2019 14:00:33 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8361FC0586D8 for ; Tue, 9 Apr 2019 18:00:32 +0000 (UTC) Date: Tue, 9 Apr 2019 19:00:29 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20190409180028.GE2964@work-vm> References: <20190408083627.7479-1-armbru@redhat.com> <20190408083627.7479-13-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190408083627.7479-13-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH 12/15] qemu-print: New qemu_printf(), qemu_vprintf() etc. 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: > We commonly want to print to the current monitor if we have one, else > to stdout/stderr. For stderr, have error_printf(). For stdout, all > we have is monitor_vfprintf(), which is rather unwieldy. We often > print to stderr just because error_printf() is easier. > > New qemu_printf() and qemu_vprintf() do exactly what's needed. The > next commits will put them to use. > > Cc: Dr. David Alan Gilbert > Signed-off-by: Markus Armbruster OK, it seems a little odd not to have the fprintf as well, but OK. Reviewed-by: Dr. David Alan Gilbert > --- > MAINTAINERS | 2 ++ > include/qemu/qemu-print.h | 19 ++++++++++++++++++ > stubs/monitor.c | 5 +++++ > util/Makefile.objs | 1 + > util/qemu-print.c | 42 +++++++++++++++++++++++++++++++++++++++ > 5 files changed, 69 insertions(+) > create mode 100644 include/qemu/qemu-print.h > create mode 100644 util/qemu-print.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 56139ac8ab..1aa19dc4ef 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1895,6 +1895,8 @@ F: hmp.[ch] > F: hmp-commands*.hx > F: include/monitor/hmp-target.h > F: tests/test-hmp.c > +F: include/qemu/qemu-print.h > +F: util/qemu-print.c > > Network device backends > M: Jason Wang > diff --git a/include/qemu/qemu-print.h b/include/qemu/qemu-print.h > new file mode 100644 > index 0000000000..8fed32bf42 > --- /dev/null > +++ b/include/qemu/qemu-print.h > @@ -0,0 +1,19 @@ > +/* > + * Print to stream or current monitor > + * > + * Copyright (C) 2019 Red Hat Inc. > + * > + * Authors: > + * Markus Armbruster , > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#ifndef QEMU_PRINT_H > +#define QEMU_PRINT_H > + > +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); > + > +#endif > diff --git a/stubs/monitor.c b/stubs/monitor.c > index b57fe6c32f..b2ea975e40 100644 > --- a/stubs/monitor.c > +++ b/stubs/monitor.c > @@ -6,6 +6,11 @@ > > __thread Monitor *cur_mon; > > +int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) > +{ > + abort(); > +} > + > int monitor_get_fd(Monitor *mon, const char *name, Error **errp) > { > error_setg(errp, "only QEMU supports file descriptor passing"); > diff --git a/util/Makefile.objs b/util/Makefile.objs > index 835fcd69e2..9206878dec 100644 > --- a/util/Makefile.objs > +++ b/util/Makefile.objs > @@ -23,6 +23,7 @@ util-obj-y += bitmap.o bitops.o hbitmap.o > util-obj-y += fifo8.o > util-obj-y += cacheinfo.o > util-obj-y += error.o qemu-error.o > +util-obj-y += qemu-print.o > util-obj-y += id.o > util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o > util-obj-y += qemu-option.o qemu-progress.o > diff --git a/util/qemu-print.c b/util/qemu-print.c > new file mode 100644 > index 0000000000..86f9417af8 > --- /dev/null > +++ b/util/qemu-print.c > @@ -0,0 +1,42 @@ > +/* > + * Print to stream or current monitor > + * > + * Copyright (C) 2019 Red Hat Inc. > + * > + * Authors: > + * Markus Armbruster , > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "monitor/monitor.h" > +#include "qemu/qemu-print.h" > + > +/* > + * Print like vprintf(). > + * Print to current monitor if we have one, else to stdout. > + */ > +int qemu_vprintf(const char *fmt, va_list ap) > +{ > + if (cur_mon) { > + return monitor_vprintf(cur_mon, fmt, ap); > + } > + return vprintf(fmt, ap); > +} > + > +/* > + * Print like printf(). > + * Print to current monitor if we have one, else to stdout. > + */ > +int qemu_printf(const char *fmt, ...) > +{ > + va_list ap; > + int ret; > + > + va_start(ap, fmt); > + ret = qemu_vprintf(fmt, ap); > + va_end(ap); > + return ret; > +} > -- > 2.17.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK