[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/39] util/log: Return bool from qemu_set_log_filename
From: |
Richard Henderson |
Subject: |
[PATCH v2 03/39] util/log: Return bool from qemu_set_log_filename |
Date: |
Sat, 26 Mar 2022 07:24:53 -0600 |
Per the recommendations in qapi/error.h, return false on failure.
Use the return value in the monitor, the only place we aren't
already passing error_fatal or error_abort.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/log.h | 2 +-
monitor/misc.c | 3 +--
util/log.c | 5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/qemu/log.h b/include/qemu/log.h
index ed59ebd4a2..fabfbe41da 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -148,7 +148,7 @@ typedef struct QEMULogItem {
extern const QEMULogItem qemu_log_items[];
void qemu_set_log(int log_flags);
-void qemu_set_log_filename(const char *filename, Error **errp);
+bool qemu_set_log_filename(const char *filename, Error **errp);
void qemu_set_dfilter_ranges(const char *ranges, Error **errp);
bool qemu_log_in_addr_range(uint64_t addr);
int qemu_str_to_log_mask(const char *str);
diff --git a/monitor/misc.c b/monitor/misc.c
index a756dbd6db..04ec0711da 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -419,8 +419,7 @@ static void hmp_logfile(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
- qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err);
- if (err) {
+ if (!qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err)) {
error_report_err(err);
}
}
diff --git a/util/log.c b/util/log.c
index ffa66a267e..a838686a18 100644
--- a/util/log.c
+++ b/util/log.c
@@ -138,7 +138,7 @@ void qemu_set_log(int log_flags)
*
* filename may be NULL. In that case, log output is sent to stderr
*/
-void qemu_set_log_filename(const char *filename, Error **errp)
+bool qemu_set_log_filename(const char *filename, Error **errp)
{
g_free(logfilename);
logfilename = NULL;
@@ -149,7 +149,7 @@ void qemu_set_log_filename(const char *filename, Error
**errp)
/* We only accept one %d, no other format strings */
if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) {
error_setg(errp, "Bad logfile format: %s", filename);
- return;
+ return false;
} else {
logfilename = g_strdup_printf(filename, getpid());
}
@@ -160,6 +160,7 @@ void qemu_set_log_filename(const char *filename, Error
**errp)
qemu_log_close();
qemu_set_log(qemu_loglevel);
+ return true;
}
/* Returns true if addr is in our debug filter or no filter defined
--
2.25.1
- [PATCH for-7.1 v2 00/39] Logging cleanup and per-thread logfiles, Richard Henderson, 2022/03/26
- [PATCH v2 2/8] linux-user/nios2: Fix clone child return, Richard Henderson, 2022/03/26
- [PATCH v2 1/8] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP, Richard Henderson, 2022/03/26
- [PATCH v2 01/39] util/log: Drop manual log buffering, Richard Henderson, 2022/03/26
- [PATCH v2 3/8] linux-user/nios2: Drop syscall 0 "workaround", Richard Henderson, 2022/03/26
- [PATCH v2 02/39] target/hexagon: Remove qemu_set_log in hexagon_translate_init, Richard Henderson, 2022/03/26
- [PATCH v2 03/39] util/log: Return bool from qemu_set_log_filename,
Richard Henderson <=
- [PATCH v2 4/8] linux-user/nios2: Adjust error return, Richard Henderson, 2022/03/26
- [PATCH v2 05/39] os-posix: Use qemu_log_enabled, Richard Henderson, 2022/03/26
- [PATCH v2 5/8] linux-user/nios2: Handle special qemu syscall return values, Richard Henderson, 2022/03/26
- [PATCH v2 6/8] linux-user/nios2: Remove do_sigreturn, Richard Henderson, 2022/03/26
- [PATCH v2 04/39] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/03/26
- [PATCH v2 06/39] util/log: Move qemu_log_lock, qemu_log_unlock out of line, Richard Henderson, 2022/03/26
- [PATCH v2 7/8] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn, Richard Henderson, 2022/03/26
- [PATCH v2 07/39] util/log: Rename qemu_log_lock to qemu_log_trylock, Richard Henderson, 2022/03/26
- [PATCH v2 08/39] hw/xen: Split out xen_pv_output_msg, Richard Henderson, 2022/03/26
- [PATCH v2 8/8] tests/tcg/nios2: Re-enable linux-user tests, Richard Henderson, 2022/03/26