[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-4.1 15/36] qemu-print: New qemu_printf(), qemu_vp
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL for-4.1 15/36] qemu-print: New qemu_printf(), qemu_vprintf() etc. |
Date: |
Thu, 18 Apr 2019 22:51:14 +0200 |
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 <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
---
MAINTAINERS | 2 ++
include/qemu/qemu-print.h | 19 ++++++++++++++++++
stubs/monitor.c | 5 +++++
tests/test-util-sockets.c | 1 +
util/Makefile.objs | 1 +
util/qemu-print.c | 42 +++++++++++++++++++++++++++++++++++++++
6 files changed, 70 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 <address@hidden>
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 <address@hidden>,
+ *
+ * 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/tests/test-util-sockets.c b/tests/test-util-sockets.c
index 6195a3ac36..fd1ced058c 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -70,6 +70,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error
**errp)
* otherwise we get duplicate syms at link time.
*/
__thread Monitor *cur_mon;
+int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) { abort(); }
void monitor_init(Chardev *chr, int flags) {}
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 <address@hidden>,
+ *
+ * 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
- [Qemu-devel] [PULL for-4.1 19/36] monitor: Simplify how -device/device_add print help, (continued)
- [Qemu-devel] [PULL for-4.1 19/36] monitor: Simplify how -device/device_add print help, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 30/36] target/i386: Simplify how x86_cpu_dump_local_apic_state() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 34/36] monitor: Clean up how monitor_disas() funnels output to monitor, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 17/36] char: Make -chardev help print to stdout, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 28/36] target: Simplify how the TARGET_cpu_list() print, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 35/36] disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 18/36] char-pty: Print "char device redirected" message to stdout, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 09/36] pci: Report fatal errors with error_report(), not error_printf(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 21/36] trace: Simplify how st_print_trace_file_status() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 10/36] hpet: Report warnings with warn_report(), not error_printf(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 15/36] qemu-print: New qemu_printf(), qemu_vprintf() etc.,
Markus Armbruster <=
- [Qemu-devel] [PULL for-4.1 05/36] qemu-img: Use error_vreport() in error_exit(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 26/36] block/qapi: Clean up how we print to monitor or stdout, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 23/36] tcg: Simplify how dump_exec_info() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 25/36] qsp: Simplify how qsp_report() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 24/36] tcg: Simplify how dump_drift_info() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 16/36] blockdev: Make -drive format=help print to stdout, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 06/36] block/ssh: Do not report read/write/flush errors to the user, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 27/36] memory: Clean up how mtree_info() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 31/36] qom/cpu: Simplify how CPUClass::dump_statistics() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 29/36] target: Clean up how the dump_mmu() print, Markus Armbruster, 2019/04/18