[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-4.1 32/36] qemu-print: New qemu_fprintf(), qemu_v
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL for-4.1 32/36] qemu-print: New qemu_fprintf(), qemu_vfprintf() |
Date: |
Thu, 18 Apr 2019 22:51:31 +0200 |
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 <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
---
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
- [Qemu-devel] [PULL for-4.1 02/36] log: Make glib logging go through QEMU, (continued)
- [Qemu-devel] [PULL for-4.1 02/36] log: Make glib logging go through QEMU, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 01/36] qemu-io: Use error_[gs]et_progname(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 13/36] vl: Make -machine $TYPE, help and -accel help print to stdout, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 03/36] error: Fix error_report_err(), warn_report_err() hint printing, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 08/36] mips/boston: Report errors with error_report(), not error_printf(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 12/36] s390x/kvm: Report warnings with warn_report(), not error_printf(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 07/36] loader-fit: Wean off error_printf(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 36/36] include: Move fprintf_function to disas/, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 14/36] monitor error: Make printf()-like functions return a value, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 22/36] tcg: Simplify how dump_opcount_info() prints, Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 32/36] qemu-print: New qemu_fprintf(), qemu_vfprintf(),
Markus Armbruster <=
- [Qemu-devel] [PULL for-4.1 11/36] vfio: Report warnings with warn_report(), not error_printf(), Markus Armbruster, 2019/04/18
- [Qemu-devel] [PULL for-4.1 20/36] include: Include fprintf-fn.h only where needed, Markus Armbruster, 2019/04/18
- [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