[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-7.1 07/36] hw/xen: Split out xen_pv_output_msg
From: |
Richard Henderson |
Subject: |
[PULL for-7.1 07/36] hw/xen: Split out xen_pv_output_msg |
Date: |
Sun, 20 Mar 2022 10:11:06 -0700 |
Do not replicate the individual logging statements.
Use qemu_log_lock/unlock instead of qemu_log directly.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/xen/xen_pvdev.c | 44 ++++++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index 8ab458922a..355bbda60d 100644
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -196,34 +196,38 @@ const char *xenbus_strstate(enum xenbus_state state)
* 2 == noisy debug messages (logfile only).
* 3 == will flood your log (logfile only).
*/
+static void xen_pv_output_msg(struct XenLegacyDevice *xendev,
+ FILE *f, const char *fmt, va_list args)
+{
+ if (xendev) {
+ fprintf(f, "xen be: %s: ", xendev->name);
+ } else {
+ fprintf(f, "xen be core: ");
+ }
+ vfprintf(f, fmt, args);
+}
+
void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level,
const char *fmt, ...)
{
+ FILE *logfile;
va_list args;
- if (xendev) {
- if (msg_level > xendev->debug) {
- return;
- }
- qemu_log("xen be: %s: ", xendev->name);
- if (msg_level == 0) {
- fprintf(stderr, "xen be: %s: ", xendev->name);
- }
- } else {
- if (msg_level > debug) {
- return;
- }
- qemu_log("xen be core: ");
- if (msg_level == 0) {
- fprintf(stderr, "xen be core: ");
- }
+ if (msg_level > (xendev ? xendev->debug : debug)) {
+ return;
}
- va_start(args, fmt);
- qemu_log_vprintf(fmt, args);
- va_end(args);
+
+ logfile = qemu_log_lock();
+ if (logfile) {
+ va_start(args, fmt);
+ xen_pv_output_msg(xendev, logfile, fmt, args);
+ va_end(args);
+ qemu_log_unlock(logfile);
+ }
+
if (msg_level == 0) {
va_start(args, fmt);
- vfprintf(stderr, fmt, args);
+ xen_pv_output_msg(xendev, stderr, fmt, args);
va_end(args);
}
qemu_log_flush();
--
2.25.1
- [PULL for-7.1 02/36] target/hexagon: Remove qemu_set_log in hexagon_translate_init, (continued)
[PULL for-7.1 07/36] hw/xen: Split out xen_pv_output_msg,
Richard Henderson <=
[PULL for-7.1 16/36] util/log: Remove qemu_log_flush, Richard Henderson, 2022/03/20
[PULL for-7.1 11/36] exec/translator: Pass the locked filepointer to disas_log hook, Richard Henderson, 2022/03/20
[PULL for-7.1 14/36] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/03/20
[PULL for-7.1 25/36] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
[PULL for-7.1 20/36] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/03/20
[PULL for-7.1 03/36] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/03/20