From nobody Sun Sep 28 16:36:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756809079; cv=none; d=zohomail.com; s=zohoarc; b=PCGB+9KUA2v3jYKsYAWl1+8u9ZUON9fYrsZfajqc3+VivS9PSqaNvaMKYLM+HjU4gAc8LpS7yN0aEhJ6G9tV2TBHY9xdt1JCe44UiZDXgNNWHrwjCpxeARPb9+8uWGyX7s8Z//i7gNM6ONJBDYumdZr1AzeSvn229CVyqwpeqnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756809079; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jx0gaB1gsva7mID0JHrMFFkewSed//dl5d0ra2Fwoi0=; b=eKLv7CK6sXz0oV879shCzpe5/xeELJ+WXm/QfblaAeWfbkh0JiwnqKm1iLs9Q8saAPzg+ryrHvc8vObzn4wj+47Ih/Zg8wzQPWt6NS0WeNxXqxoedCIrPEqA+2lSa3v8yonvktCAJPXD0l57pkvcKDOsBBado+SM2zzB+x0eOKQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756809079634844.6641786783832; Tue, 2 Sep 2025 03:31:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utOHu-00073a-LR; Tue, 02 Sep 2025 06:30:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utOHM-0006hr-Ss for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:26 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utOHI-00011p-8T for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:19 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3ce4ed7a73fso2674973f8f.1 for ; Tue, 02 Sep 2025 03:30:15 -0700 (PDT) Received: from stoup.. (151-0-205-164.ip282.fastwebnet.it. [151.0.205.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b6f0d32a2sm296470665e9.9.2025.09.02.03.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Sep 2025 03:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756809014; x=1757413814; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jx0gaB1gsva7mID0JHrMFFkewSed//dl5d0ra2Fwoi0=; b=JPJsJadd113zowauFWQ+NFZKpWjcsHVfiOX8/56dj8AjfyWcOJev5gqjU8zXEL4lKr MXofboy5WzNmZMenYBWmHtuJUVlnj+aK1byiXn86TbiwWtt34nn0daNdDa8ou115YAIG IZ7NfoChKPcN060dqsxxTV7R6ck+KOCi0q0zOzSVBPPMvcd5ymWbidKfSF9nrYpoVlaR 4fGRQ59PYBZY6Lv8OeB2oJzUsOLTzRfe1fp9k4OYwybJCiLQ18YlwP5GYWDsCWd0ksaH 3yYuO2RHEo5hNIeRgwB0kKlk30Xh/ibv469gRuQXtJ1OuT60b7djatOEd4mE4G08ZcqJ KQEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756809014; x=1757413814; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jx0gaB1gsva7mID0JHrMFFkewSed//dl5d0ra2Fwoi0=; b=Xg5iqxC1GXbIPKS20WZ6HXZ6lSnKEM3LtaVSyTWHzQ5L0GK9Dsj+7h0RkcIWZlMNyK hInVjqhbyeC/Khwgrto6Af0f26+71DQ8v19iPJrmc71PJNnkTXDDw4z+P+9H2vxUyNLz 1OY40nInQQ33ro4WEWHzrW2hLUtGhmfC2A0dtBk57Ltdxbt1b0amIEEiBjwnIPUBeKK/ t+O49uV3MAsf9Uh6812GbuR2CNgkqYjF4R3I1Mro7cVlRMUCoB9CSVvsAQm9D1/o2c5f TBtIfQ1QSjsmT1zZrUp3RgeAgNpL16Wt6Gaak+KDCcPQv2vOYlkFkCaN9lZjMdh85C+J 4LGg== X-Gm-Message-State: AOJu0YzsB1xOGGnQyrK5JEWInGjXM8sgKuD/Rbc4dL/K/Nl2biTt89KF XqHZItfFV/du0sf30c2tQS1Hwc7CXgSqUTEd8LIIGT9/v6bF1lWDbnhkWaGGuhkMNFH4cDy4Ta4 MFEWl5N0= X-Gm-Gg: ASbGncur5vFRuAb3tFoC9WWRJwJSG7TO4fUJINR0JJu92NW9UjNdf6rCsT7yj7QLyOD NnLglKvZkwqsOb3dyrIgd2z/ESEKNKTrIJYeuuAf45g45HGGLNA2zcwUf9H+HfzBxfeNpBJIIHn VUkIygIvfCIiOqTEkJMbc3haRgs2g3/IA39tGTWyhidCdIDW/1fehYecAbS+zrYTxZ9OwhxY2Eo +VrREhIVJCNHrbDrsuQyBXfpIoRl7XBBw2SCrSUPZgUmmqkYtEd6mTC/RxXBUsDZ3BPvKmb5Mx5 P2MakhxTe/ATh12P+xm58QAvFmtGqMYaA6D3QhuzKFt5CYwfC/t/9Ry+Q/gwbEMlilcp9HJU3EU oseCzc7c6n5ZoLukd1SWPTBBcAbMlPtFagLkmKcDbKajT2roK7WYOhc6AxUmKOjd6apYeTNikPQ == X-Google-Smtp-Source: AGHT+IHhQWwo3VyernzucK4Mb+JHtbhYxaZlH3U+bgIl27N28RyrfR4HVViHvOCAWnTji6aSLf0IAg== X-Received: by 2002:a05:6000:290b:b0:3c7:df1d:3d9 with SMTP id ffacd0b85a97d-3d1dfa19a4dmr9643779f8f.39.1756809013930; Tue, 02 Sep 2025 03:30:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: berrange@redhat.com Subject: [RFC 1/4] util: Introduce LogOutput Date: Tue, 2 Sep 2025 12:30:07 +0200 Message-ID: <20250902103010.309094-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250902103010.309094-1-richard.henderson@linaro.org> References: <20250902103010.309094-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756809082342124100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- include/monitor/monitor.h | 4 +++ include/qemu/log-output.h | 14 ++++++++++ monitor/monitor.c | 54 +++++++++++++++++++++++++++++++-------- stubs/error-printf.c | 11 ++++++++ util/log.c | 7 +++++ 5 files changed, 79 insertions(+), 11 deletions(-) create mode 100644 include/qemu/log-output.h diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index c3740ec616..8c4d73592f 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -4,6 +4,7 @@ #include "block/block.h" #include "qapi/qapi-types-misc.h" #include "qemu/readline.h" +#include "qemu/log-output.h" #include "exec/hwaddr.h" =20 typedef struct MonitorHMP MonitorHMP; @@ -62,4 +63,7 @@ void monitor_register_hmp_info_hrt(const char *name, int error_vprintf_unless_qmp(const char *fmt, va_list ap) G_GNUC_PRINTF(1,= 0); int error_printf_unless_qmp(const char *fmt, ...) G_GNUC_PRINTF(1, 2); =20 +const LogOutput *error_log_output(void **popaque); +const LogOutput *error_log_output_unless_qmp(void **popaque); + #endif /* MONITOR_H */ diff --git a/include/qemu/log-output.h b/include/qemu/log-output.h new file mode 100644 index 0000000000..1d502aae77 --- /dev/null +++ b/include/qemu/log-output.h @@ -0,0 +1,14 @@ +#ifndef QEMU_LOG_OUTPUT_H +#define QEMU_LOG_OUTPUT_H 1 + +typedef int LogOutputVararg(void *, const char *, ...) G_GNUC_PRINTF(2, 3); +typedef int LogOutputVaList(void *, const char *, va_list) G_GNUC_PRINTF(2= , 0); + +typedef struct LogOutput { + LogOutputVararg *print; + LogOutputVaList *vprint; +} LogOutput; + +extern const LogOutput log_output_stdio; + +#endif diff --git a/monitor/monitor.c b/monitor/monitor.c index da54e1b1ce..71a3d62e0f 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -268,28 +268,60 @@ void monitor_printc(Monitor *mon, int c) monitor_printf(mon, "'"); } =20 +static const LogOutput log_output_monitor =3D { + /* Abuse the Monitor* argument of monitor_printf as void* opaque. */ + (LogOutputVararg *)monitor_printf, + (LogOutputVaList *)monitor_vprintf, +}; + +const LogOutput *error_log_output(void **popaque) +{ + Monitor *cur_mon =3D monitor_cur(); + + if (cur_mon && !monitor_cur_is_qmp()) { + *popaque =3D cur_mon; + return &log_output_monitor; + } + + *popaque =3D stderr; + return &log_output_stdio; +} + +const LogOutput *error_log_output_unless_qmp(void **popaque) +{ + Monitor *cur_mon =3D monitor_cur(); + + if (!cur_mon) { + *popaque =3D stderr; + return &log_output_stdio; + } + if (!monitor_cur_is_qmp()) { + *popaque =3D cur_mon; + return &log_output_monitor; + } + + *popaque =3D NULL; + return NULL; +} + /* * Print to current monitor if we have one, else to stderr. */ int error_vprintf(const char *fmt, va_list ap) { - Monitor *cur_mon =3D monitor_cur(); + void *opaque; + const LogOutput *l =3D error_log_output(&opaque); =20 - if (cur_mon && !monitor_cur_is_qmp()) { - return monitor_vprintf(cur_mon, fmt, ap); - } - return vfprintf(stderr, fmt, ap); + return l->vprint(opaque, fmt, ap); } =20 int error_vprintf_unless_qmp(const char *fmt, va_list ap) { - Monitor *cur_mon =3D monitor_cur(); + void *opaque; + const LogOutput *l =3D error_log_output_unless_qmp(&opaque); =20 - if (!cur_mon) { - return vfprintf(stderr, fmt, ap); - } - if (!monitor_cur_is_qmp()) { - return monitor_vprintf(cur_mon, fmt, ap); + if (l) { + return l->vprint(opaque, fmt, ap); } return -1; } diff --git a/stubs/error-printf.c b/stubs/error-printf.c index 0e326d8010..82e4756bda 100644 --- a/stubs/error-printf.c +++ b/stubs/error-printf.c @@ -21,3 +21,14 @@ int error_vprintf_unless_qmp(const char *fmt, va_list ap) { return error_vprintf(fmt, ap); } + +const LogOutput *error_log_output(void **popaque) +{ + *popaque =3D stderr; + return &log_output_stdio; +} + +const LogOutput *error_log_output_unless_qmp(void **popaque) +{ + return error_log_output(popaque); +} diff --git a/util/log.c b/util/log.c index fc900cde0c..4b5953dcc7 100644 --- a/util/log.c +++ b/util/log.c @@ -28,6 +28,7 @@ #include "qemu/thread.h" #include "qemu/lockable.h" #include "qemu/rcu.h" +#include "qemu/log-output.h" #ifdef CONFIG_LINUX #include #endif @@ -592,3 +593,9 @@ ssize_t rust_fwrite(const void *ptr, size_t size, size_= t nmemb, FILE *stream) return ret < 0 ? -errno : 0; } #endif + +const LogOutput log_output_stdio =3D { + /* Abuse the FILE* argument of fprintf as void* opaque. */ + (LogOutputVararg *)fprintf, + (LogOutputVaList *)vfprintf, +}; --=20 2.43.0 From nobody Sun Sep 28 16:36:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756809035; cv=none; d=zohomail.com; s=zohoarc; b=LmgrDDzFt938s6gbulea4/Kw5wJ+JyO6Bjft3Olv9eCJFWgCxTxj0+4cjCvtxRgGCS6cVQigEbR6ITT0kVy1C9605f28Hh3FDecP0Oa+cTXPfoPKxDZo0ksjgNf09lokDu6TPgFycTurjWFMmWoU71P/IETqaNG4VGaS8Af589U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756809035; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8DZzfloCVYfnawb+HNzXt3BHlSz81vZt+CpZ/An1bjc=; b=M2MsK+iVuDqHN9ROvdwn+2RaaI4lkjoHjSJ70fyg+fh6BuBRUgX55vclI6znC9bNeMHWXtPuJZJc+alaV0Gtj8jBb8t+Yk8tiqbuwUlJDfnY0s8A7tz/vatptpdSWtFP4hKhO9j+qwVQxXA4Av4+QcwINx9bHGNszkoQCIRk7dY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756809035752754.228166303666; Tue, 2 Sep 2025 03:30:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utOHU-0006la-7U; Tue, 02 Sep 2025 06:30:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utOHN-0006ht-DU for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:26 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utOHK-00012E-1O for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:19 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-45b8b1a104cso19606105e9.2 for ; Tue, 02 Sep 2025 03:30:17 -0700 (PDT) Received: from stoup.. (151-0-205-164.ip282.fastwebnet.it. [151.0.205.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b6f0d32a2sm296470665e9.9.2025.09.02.03.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Sep 2025 03:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756809016; x=1757413816; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8DZzfloCVYfnawb+HNzXt3BHlSz81vZt+CpZ/An1bjc=; b=hYrPyl13PiqR4upuXQsRkEYS3pDLMjGCNv1aQ8nSTxmQLGCQoqlk/F7Im0O7iCGE0T I00/H1QgdbISiOAW5+kN34ClvR3Xtht5rOvMeD6SGqaT3kUXXRGmiu4hb8a4CdujgbIs aBzCQuCWQbMMYmUCFj63rJrM1qu+bdwkCQx2k5W1xXKFv8haYGVyV3J8pof5Braf6DA5 H0bddKL46nvYrYRGIx8InR7+OfPfYnvJAzs83ROHnLABaC3hbJiMa/cPMMhBaLIfLUr0 n1zS0XEk97nH+3JshTspgcvbwR7mEfEcB1Z7MEy3FQqB96N/CXX5lhLPK9AC/rwnXnA5 QQLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756809016; x=1757413816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8DZzfloCVYfnawb+HNzXt3BHlSz81vZt+CpZ/An1bjc=; b=uJiWn/6ZBHjF8gz3my5aNQV8TCkJ5eQ7p5IPisqwGVXGwglubZ63Zcl5TrTkGCk9mN R5j3IRFw4ZHjZ19J2rZwRq4Hx+YgIvKcuNq31N2Asq5Ha4TMiEWV2Zxc+BfzHU4WX4pj NCltrBTA6fOTbeGAE9JslaL9X8bMXplOYjew+JjD9qrZJmFHJ95VMYifm2L44wuvcAUW FZwyeOh7FzTtV9MKBQTN4f2vhkGWC91zyuozxLQcwDyXSbf+EAL2RlwSx4kQS2XZrpdd Jw5U+RW55Bhf5Jopb69M1GIhCAkL3lOOmpHPZPGbdgwyV1sQP3Hp2V5y58InUjKNp1xZ XjCw== X-Gm-Message-State: AOJu0YzAt4hvm+FsQW3y/zzyQ3CE6N3oJ69IHuzVpMHRWz8SSOOibrSV fKr2EPE5zdpQhtbTW6n4WK+L75osXv844LoIK3S4nvXbZNN0AeaCELVJKD6bYiul2hQBfw1yySx 6terQb+Y= X-Gm-Gg: ASbGnct+AySCjRKN4Lt+mGAIp45vKAxg4dkaIEoqvwL3XMcsqrVK9O1sRYpw+Ysy8re wIVtIYqNwsVDCXz9Sx3qZIGB2SGUJQYM/Tnf5w5gMT3DMKZzyK9JqzMoNiMbeD8+gRZhh3ymCjN QsouiWr6t26Bv+jv4fopqrgHSml86pbo2C3IVQbLQBzEHIFi2w9YJDtjcZABNyBccKeO8fI13AR Eu0uxEBhV88Hw86JbUA/N4x29EIDteWSzXoJ5uVakfmz3MAVIJ5TGM1zjcA4gwQZH/QmcgKWH2q PJVamZmw7bVLoBgGdPosU6C1TD+9607OuugZ3N/qsN7qnb+qMIFmpUZALv++cEmZCoDE9V8u72d d/ibCVzzEBruF87AENcYd8HSTdkZuLYKTLeLF8jDzvxsFbiLAVAUOuFFbNHCW8kE= X-Google-Smtp-Source: AGHT+IFJw/io0xUn77SLs4ccx+FzaqLixdyicaC1K62fMKtpMUpQdL4j89LVAEXIdH95f6bUaunIWg== X-Received: by 2002:a05:6000:4312:b0:3cf:3f1:acc3 with SMTP id ffacd0b85a97d-3d1df631895mr9852288f8f.60.1756809015716; Tue, 02 Sep 2025 03:30:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: berrange@redhat.com Subject: [RFC 2/4] util: Drop QMESSAGE_CONTEXT_SKIP_MONITOR Date: Tue, 2 Sep 2025 12:30:08 +0200 Message-ID: <20250902103010.309094-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250902103010.309094-1-richard.henderson@linaro.org> References: <20250902103010.309094-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756809037979124100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- include/qemu/message.h | 11 +---------- util/error-report.c | 9 +++++---- util/log.c | 2 +- util/message.c | 7 +------ 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/include/qemu/message.h b/include/qemu/message.h index 6dbb068ca9..68b08f0ea7 100644 --- a/include/qemu/message.h +++ b/include/qemu/message.h @@ -28,25 +28,16 @@ void qmessage_set_format(int flags); */ void qmessage_set_workload_name(const char *name); =20 -enum QMessageContextFlags { - QMESSAGE_CONTEXT_SKIP_MONITOR =3D (1 << 0), -}; - /** * qmessage_context: - * @flags: the message formatting control flags * * Format a message prefix with the information * previously selected by a call to * qmessage_set_format. * - * If @flags contains QMESSAGE_CONTEXT_SKIP_MONITOR - * an empty string will be returned if running in - * the context of a HMP command - * * Returns: a formatted message prefix, or empty string; * to be freed by the caller. */ -char *qmessage_context(int flags); +char *qmessage_context(void); =20 #endif /* QEMU_MESSAGE_H */ diff --git a/util/error-report.c b/util/error-report.c index 2e58ee1c50..fa34019dad 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -172,10 +172,11 @@ static void print_loc(void) G_GNUC_PRINTF(2, 0) static void vreport(report_type type, const char *fmt, va_list ap) { - g_autofree gchar *context =3D qmessage_context(QMESSAGE_CONTEXT_SKIP_M= ONITOR); - - if (context !=3D NULL) { - error_printf("%s", context); + if (!monitor_cur()) { + g_autofree gchar *context =3D qmessage_context(); + if (context) { + error_printf("%s", context); + } } =20 print_loc(); diff --git a/util/log.c b/util/log.c index 4b5953dcc7..b129634708 100644 --- a/util/log.c +++ b/util/log.c @@ -161,7 +161,7 @@ void qemu_log(const char *fmt, ...) * acquiring the mutex */ g_autofree const char *context =3D - incomplete ? NULL : qmessage_context(0); + incomplete ? NULL : qmessage_context(); =20 f =3D qemu_log_trylock(); if (f) { diff --git a/util/message.c b/util/message.c index 6d3580b7be..8deba3940c 100644 --- a/util/message.c +++ b/util/message.c @@ -20,17 +20,12 @@ void qmessage_set_workload_name(const char *name) } =20 =20 -char *qmessage_context(int flags) +char *qmessage_context(void) { g_autofree char *timestr =3D NULL; const char *wknamestr =3D NULL; const char *pgnamestr =3D NULL; =20 - if ((flags & QMESSAGE_CONTEXT_SKIP_MONITOR) && - monitor_cur()) { - return NULL; - } - if (message_format & QMESSAGE_FORMAT_TIMESTAMP) { g_autoptr(GDateTime) dt =3D g_date_time_new_now_utc(); timestr =3D g_date_time_format_iso8601(dt); --=20 2.43.0 From nobody Sun Sep 28 16:36:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756809072; cv=none; d=zohomail.com; s=zohoarc; b=lhL0cPDHx7aiwqd3InuUCebdg4mRxiFfEJW+ycwy58dBHeoGQXNthQ2mvkesHS+rzB2uJj2ZKDa8tltQqoTVFgjqTMnHmOzGP/IF4xj1br3dDN/LK47rCjOnvVt4UJyV5jf4k4yfh/QW2YgXEDVDmHyuEqxjm4U9EHOsSRyfVfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756809072; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xQrZp/o3nVe5VIQl1WMbqwaLzlGBPHdSsPm8KVtBY6o=; b=GH/+VWQn2nIlUMt7R7hZXFBL24GgRaC3GrGvp2dhsaPUhsdQ2tqRECbY/QBkYUnB1AttEs8DgXkXNDw/29tef8WhzQQo39kjER5hxossQGcA4O3LZdaQh2hb+LM93kyduXFy3rNUZkTGGHIsG3VxfoCEWFORBAyh1MMOd04synA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175680907229258.84376157203849; Tue, 2 Sep 2025 03:31:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utOHz-0007Me-RR; Tue, 02 Sep 2025 06:30:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utOHS-0006iQ-2p for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:26 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utOHL-00012N-3F for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:22 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-45b627ea685so44391065e9.1 for ; Tue, 02 Sep 2025 03:30:18 -0700 (PDT) Received: from stoup.. (151-0-205-164.ip282.fastwebnet.it. [151.0.205.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b6f0d32a2sm296470665e9.9.2025.09.02.03.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Sep 2025 03:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756809017; x=1757413817; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xQrZp/o3nVe5VIQl1WMbqwaLzlGBPHdSsPm8KVtBY6o=; b=vT7kHvtnAVd7yjLYmJ//8lTlUaNSnFo5EY6fLdbzDC8ulV1d60yatvys6me5zUdBM0 vMmnGqexGHyTqKfwYdnnxuuKSo7cJMnMRNmaerIurv08qpk20qDxVJg1rsq7A39zUCEC 6bWOZLa6F578JDcUzCWQ6lgyoq/u4FyauCdIujRlrD6yq6VaIb/FyDmfU69Ml6Fj7Xak Ags/QLe5mrq+8sGcbXKEyvjgUp7RCrypuOgXMgic/civsQdC3F4f++YANFK0stz3cuY4 5ukMgEOGRyWebkXw3MMPzIOiUe8udrtzclVfpw8HwtBVMQejtUsSjWKCcRzklvfXtnbP YElw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756809017; x=1757413817; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xQrZp/o3nVe5VIQl1WMbqwaLzlGBPHdSsPm8KVtBY6o=; b=SaaKegDbB16Z8itF44qEYycricb4uip17/fWcg3afNGO7iVI5HRCM399RVmjJPafWw uyOQptZVCJdeayfDE8dEW08OdGwc5KcK6uf9lxySl0GR7HBtt+eWFucNgDse122Kpk5I bdplhfri6KLAZKs2WarcGwVByeetjC2nujO4NkO3NyjAvnnZfSXtJVnLz/0kzo2KxNWn HhhvvveGRuhzMjU3U0k5yWbUkeilyCDNK5Tk0kwl6FXb3bX6SxHkwx8LO//EwhbL+igP 3Irw7MlruyedFvxUscALanvliFihcRawV2YDKpLCIRsLgRgquSOW0hegzaGnvNxzT/// 5JhQ== X-Gm-Message-State: AOJu0YytrjXQJ3kMiHRDx2Um97JVOZjxcp1ZxUPcvVWWu+ir+jV+LSl1 COmqFHCyDwf/+FyOq+I7Qs9wN3SErsINU3kaS5K/q940vvVM6/lgOGqrD4KlVQF6RO7mYherIG9 DN61qVZE= X-Gm-Gg: ASbGncvwdp300LLEaly2YupWjCPUerDXWyAku+/TtP5BswbM/J63FtyL3pakUFLMv3Q B+O2W80vbw87AVWH6lReu2zVBF2MJTCJWK6J8M85+K+5c62ARAqwypdyX+O+2mn570o1K+12uJw Kt2PjmmjEVrUy4/O8zGxblMkYRD08aCZWbSs2I8M1dsJLRRhFOsXPb5eoq8I3PYeU9N7gq9FO9q 4OMgjfmKzEI4QjpIFyDB/Fs0DFpMJjere8LO2Xad5/KQQRzp64WnAxTgy9nCQmlX9V94/sOfleX b5FV18qN63jzr2yj9CE5l2M+wK0ElNLRnRV+gybOAn1D30AXcNK8416s8CV8g4rHaU/LPugipP+ XAcG23tXKuNiB/ExN3BngOEFjdcbm+IMYsXAhVVHd3pyEa4XCrnH/QRxGwA6a8/DeJkIq+ezjRA == X-Google-Smtp-Source: AGHT+IE8QeM8eGqgCZQOVwH0QH9cFIshjds/kkQ0aUrifjSIPCpaTztCKvnoe1lxUNZ156SuuPGFgQ== X-Received: by 2002:a05:600c:3b84:b0:45b:89ef:65ae with SMTP id 5b1f17b1804b1-45b89ef6623mr90153345e9.16.1756809017030; Tue, 02 Sep 2025 03:30:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: berrange@redhat.com Subject: [RFC 3/4] util/message: Use LogOutput Date: Tue, 2 Sep 2025 12:30:09 +0200 Message-ID: <20250902103010.309094-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250902103010.309094-1-richard.henderson@linaro.org> References: <20250902103010.309094-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756809073419116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- include/qemu/message.h | 12 +++++------- util/error-report.c | 8 ++++---- util/log.c | 16 ++-------------- util/message.c | 40 ++++++++++++++++++---------------------- 4 files changed, 29 insertions(+), 47 deletions(-) diff --git a/include/qemu/message.h b/include/qemu/message.h index 68b08f0ea7..ac285a0021 100644 --- a/include/qemu/message.h +++ b/include/qemu/message.h @@ -3,6 +3,8 @@ #ifndef QEMU_MESSAGE_H #define QEMU_MESSAGE_H =20 +#include "qemu/log-output.h" + enum QMessageFormatFlags { QMESSAGE_FORMAT_TIMESTAMP =3D (1 << 0), QMESSAGE_FORMAT_WORKLOAD_NAME =3D (1 << 1), @@ -31,13 +33,9 @@ void qmessage_set_workload_name(const char *name); /** * qmessage_context: * - * Format a message prefix with the information - * previously selected by a call to - * qmessage_set_format. - * - * Returns: a formatted message prefix, or empty string; - * to be freed by the caller. + * Format a message prefix with the information previously selected + * by a call to qmessage_set_format. */ -char *qmessage_context(void); +void qmessage_context(const LogOutput *l, void *opaque); =20 #endif /* QEMU_MESSAGE_H */ diff --git a/util/error-report.c b/util/error-report.c index fa34019dad..6ef556af5f 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -173,10 +173,10 @@ G_GNUC_PRINTF(2, 0) static void vreport(report_type type, const char *fmt, va_list ap) { if (!monitor_cur()) { - g_autofree gchar *context =3D qmessage_context(); - if (context) { - error_printf("%s", context); - } + void *opaque; + const LogOutput *l =3D error_log_output(&opaque); + + qmessage_context(l, opaque); } =20 print_loc(); diff --git a/util/log.c b/util/log.c index b129634708..8bbd8e5dda 100644 --- a/util/log.c +++ b/util/log.c @@ -153,23 +153,11 @@ static __thread bool incomplete; =20 void qemu_log(const char *fmt, ...) { - FILE *f; - /* - * Prepare the context *outside* the logging - * lock so any timestamp better reflects when - * the message was emitted if we are delayed - * acquiring the mutex - */ - g_autofree const char *context =3D - incomplete ? NULL : qmessage_context(); - - f =3D qemu_log_trylock(); + FILE *f =3D qemu_log_trylock(); if (f) { va_list ap; =20 - if (context !=3D NULL) { - fwrite(context, 1, strlen(context), f); - } + qmessage_context(&log_output_stdio, f); =20 va_start(ap, fmt); vfprintf(f, fmt, ap); diff --git a/util/message.c b/util/message.c index 8deba3940c..0c63d128fc 100644 --- a/util/message.c +++ b/util/message.c @@ -20,7 +20,7 @@ void qmessage_set_workload_name(const char *name) } =20 =20 -char *qmessage_context(void) +void qmessage_context(const LogOutput *l, void *opaque) { g_autofree char *timestr =3D NULL; const char *wknamestr =3D NULL; @@ -43,26 +43,22 @@ char *qmessage_context(void) int thid =3D qemu_get_thread_id(); const char *thname =3D qemu_thread_get_name(); =20 - return g_strdup_printf("%s%s%s%s%s%s(%d:%s): ", - timestr ? timestr : "", - timestr ? " " : "", - wknamestr ? "[" : "", - wknamestr ? wknamestr : "", - wknamestr ? "] " : "", - pgnamestr ? pgnamestr : "", - thid, thname); - } else { - if (!timestr && !wknamestr && !pgnamestr) { - return NULL; - } - - return g_strdup_printf("%s%s%s%s%s%s%s", - timestr ? timestr : "", - timestr ? " " : "", - wknamestr ? "[" : "", - wknamestr ? wknamestr : "", - wknamestr ? "] " : "", - pgnamestr ? pgnamestr : "", - pgnamestr ? ": " : ""); + l->print(opaque, "%s%s%s%s%s%s(%d:%s): ", + timestr ? timestr : "", + timestr ? " " : "", + wknamestr ? "[" : "", + wknamestr ? wknamestr : "", + wknamestr ? "] " : "", + pgnamestr ? pgnamestr : "", + thid, thname); + } else if (timestr || wknamestr || pgnamestr) { + l->print(opaque, "%s%s%s%s%s%s%s", + timestr ? timestr : "", + timestr ? " " : "", + wknamestr ? "[" : "", + wknamestr ? wknamestr : "", + wknamestr ? "] " : "", + pgnamestr ? pgnamestr : "", + pgnamestr ? ": " : ""); } } --=20 2.43.0 From nobody Sun Sep 28 16:36:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756809058; cv=none; d=zohomail.com; s=zohoarc; b=EPYm8gpWGjzkovC+hvqv798rqVyLaBX3MI6zNjCtyM2QWdow/rtk1/jjol064oUl3nmH4XeJmuE5SJp/poVf5j+ljlGe5ubolZQlQSBYHPsmA0jf/H83SKkTgLAe6yoRWh1iINjnRUMyQulOMnpMILzfPhCM3U4diE7HV7eLiSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756809058; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=on4A+GT89TCdUZSaNdrGf23a3e80Lqu5mz2DsnpTu8Q=; b=CUs7FzXpqvsMIuRPlZTj1NLO1Zwqdp2PL7qatos9fC9wCyhsVOyi1XZKAusAm/C4GdT/P5j+kGoHTcJIIVMTU6J6c0TJGRj0Kxk4wWZrCYSno6enoTVuX5VuIu22zKwvKzgFHeTQvRlTlB1WcFwOb7TmqSHRD9UKmVGuLNa6Wkg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175680905846044.358355101155894; Tue, 2 Sep 2025 03:30:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utOHl-0006pY-DZ; Tue, 02 Sep 2025 06:30:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utOHS-0006iR-3D for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:26 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utOHM-00012b-Kw for qemu-devel@nongnu.org; Tue, 02 Sep 2025 06:30:24 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45b87bc67a4so17204155e9.3 for ; Tue, 02 Sep 2025 03:30:19 -0700 (PDT) Received: from stoup.. (151-0-205-164.ip282.fastwebnet.it. [151.0.205.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b6f0d32a2sm296470665e9.9.2025.09.02.03.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Sep 2025 03:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756809018; x=1757413818; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=on4A+GT89TCdUZSaNdrGf23a3e80Lqu5mz2DsnpTu8Q=; b=SSfNhHn+UoEFrqvU2Z4VEehC2hmePm8HmCb63q+zL87JOLuFrIX45fGlH9BzLczvCH szvO+Kk8AuKpMsiGWH9ERzBMZejjqPoB1kwqqNE1ZKqj02mEURo6Zc7UCbSlhXHIe+// thfWV6C35j1NGAPGigK0rbHlyNATUmY0vDnt8CgYl8mIWp5B+jJ24lLKsxtkn0DVkbyX SpkASxZWMaz8y4uidtQd9eQpWUofRHqJd9u2Sc1Kkb/axtMXjBw1bEC4VHZUK1t477SN 0X2SWd1ZvenIHBuKdgChdSrg+7tl33RjIjNWfZGbWVzhC1zg2AmuseOk++xuMsnwMeCD n4rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756809018; x=1757413818; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=on4A+GT89TCdUZSaNdrGf23a3e80Lqu5mz2DsnpTu8Q=; b=ZqGVYQodNNmYtLhjdMGGI4vI/KgN5FQGBT5MhX2G875/slPoeo+aP6TSiiBVB+5U9d kp9Wq82Dqj/tCXPN7var5A0V3raCg/dIn/OdscOgXG7r7YTbbm6O5XbqOtUuS7V3DSQF cQoNDnxGw3mDNNON4Ci2n3XLZY1rDffKcZ7UH2kc9Y3g1/ECg9WdUYr18gJmrxZckT26 rEfRWq8e/GF0bXGovveGk1w38yzP8PvEjOVN/57ZgubXHowNeOAvHADHcESMWk6StLaa luF/s0OEsA7B6Ta6egmUF2kjVrfdkNbS6W1xF7J+wP13S32xA2lM0YjZhqYdmSDfDtng mcZg== X-Gm-Message-State: AOJu0YzBDz5xEZqds5HzLoocz2/pSKKH+wBf0ua5GIS/KMeHJeTsUFyZ u2OJdFGjAm25Ysmdgnq+nZYpddyTVyy4AthQ+M39dtlQH+pPUWlNNM6qu4kC8YbhcO2RJ3x8mGh +OrSujSU= X-Gm-Gg: ASbGncubVrFsHDlE5ssPelwMJs4829oZVbexpv3iVLZYCSfYFoWFHRQnNlkzKqs6cni IsNkNHGPBFlepEdSwzOKOCYks9StROhJ6JxkIl6+zPPc1GytX7y5hvPFYnhnbK8b+RBANNrExL6 HAoADYfr1KRTmIafvTjgCxKLYkNaJxLBRrG1A12pjS0cL9eX7v4FYuGgcc9cUaigtB0LFtD14A5 Gac2bK4l4Hm06B7ywNc9WW1gE9AT8FvqCfiGGcjqDZ5LNhLl/SrJcJTyd/0QsVRoG/xG8wV3ulE +51dj1iZVOoW4FyGUELojCF0zW1iCl5blcDJL+STZMsD1iyJiTdKdR+Xx2y+VqKFTzOzvET3LWo iVDlQeYvPjPcBdQEdYmD/nV7sTtdyNz2n99zbuPhlbEUiX6i25FvzesQ94KAXHrHWMtamyJDq3A == X-Google-Smtp-Source: AGHT+IHKA6ZKsCdycg+Bp/Lv1UkvlSmjtEiQckLuBdmim4eFtGtcAEeKqym7Cdj1TP2FNKZjQH1s9A== X-Received: by 2002:a05:600c:474f:b0:459:ea5d:418b with SMTP id 5b1f17b1804b1-45b85532b10mr89518435e9.9.1756809018375; Tue, 02 Sep 2025 03:30:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: berrange@redhat.com Subject: [RFC 4/4] util/error-report: Use LogOutput in vreport Date: Tue, 2 Sep 2025 12:30:10 +0200 Message-ID: <20250902103010.309094-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250902103010.309094-1-richard.henderson@linaro.org> References: <20250902103010.309094-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756809059222116600 Content-Type: text/plain; charset="utf-8" Merge print_loc. Use the LogOutput callbacks instead of error_printf and error_vprintf. Signed-off-by: Richard Henderson --- util/error-report.c | 72 +++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/util/error-report.c b/util/error-report.c index 6ef556af5f..db5b2c1608 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -132,36 +132,6 @@ void loc_set_file(const char *fname, int lno) } } =20 -/* - * Print current location to current monitor if we have one, else to stder= r. - */ -static void print_loc(void) -{ - const char *sep =3D ""; - int i; - const char *const *argp; - - switch (cur_loc->kind) { - case LOC_CMDLINE: - argp =3D cur_loc->ptr; - for (i =3D 0; i < cur_loc->num; i++) { - error_printf("%s%s", sep, argp[i]); - sep =3D " "; - } - error_printf(": "); - break; - case LOC_FILE: - error_printf("%s:", (const char *)cur_loc->ptr); - if (cur_loc->num) { - error_printf("%d:", cur_loc->num); - } - error_printf(" "); - break; - default: - error_printf("%s", sep); - } -} - /* * Print a message to current monitor if we have one, else to stderr. * @report_type is the type of message: error, warning or informational. @@ -172,28 +142,54 @@ static void print_loc(void) G_GNUC_PRINTF(2, 0) static void vreport(report_type type, const char *fmt, va_list ap) { - if (!monitor_cur()) { - void *opaque; - const LogOutput *l =3D error_log_output(&opaque); + void *opaque; + const LogOutput *l =3D error_log_output(&opaque); =20 + if (!monitor_cur()) { qmessage_context(l, opaque); } =20 - print_loc(); + switch (cur_loc->kind) { + case LOC_CMDLINE: + { + const char *const *argp =3D cur_loc->ptr; + const char *sep =3D ""; + + for (int i =3D 0; i < cur_loc->num; i++) { + l->print(opaque, "%s%s", sep, argp[i]); + sep =3D " "; + } + l->print(opaque, ": "); + } + break; + case LOC_FILE: + { + const char *file =3D cur_loc->ptr; + + if (cur_loc->num) { + error_printf("%s:%d: ", file, cur_loc->num); + } else { + error_printf("%s: ", file); + } + } + break; + case LOC_NONE: + break; + } =20 switch (type) { case REPORT_TYPE_ERROR: break; case REPORT_TYPE_WARNING: - error_printf("warning: "); + l->print(opaque, "warning: "); break; case REPORT_TYPE_INFO: - error_printf("info: "); + l->print(opaque, "info: "); break; } =20 - error_vprintf(fmt, ap); - error_printf("\n"); + l->vprint(opaque, fmt, ap); + l->print(opaque, "\n"); } =20 /* --=20 2.43.0