OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/log: Return bool from qemu_set_log_filename 

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.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220417183019.755276-4-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-17 11:29:43 -07:00
parent eecb0c4e11
commit e2c7c6a454
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/log.h
View File

@ -148,7 +148,7 @@ typedef struct QEMULogItem {
extern const QEMULogItem qemu_log_items[]; extern const QEMULogItem qemu_log_items[];
void qemu_set_log(int log_flags); 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); void qemu_set_dfilter_ranges(const char *ranges, Error **errp);
bool qemu_log_in_addr_range(uint64_t addr); bool qemu_log_in_addr_range(uint64_t addr);
int qemu_str_to_log_mask(const char *str); int qemu_str_to_log_mask(const char *str);

3
monitor/misc.c
View File

@ -419,8 +419,7 @@ static void hmp_logfile(Monitor *mon, const QDict *qdict)
{ {
Error *err = NULL; Error *err = NULL;
qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err); if (!qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err)) {
if (err) {
error_report_err(err); error_report_err(err);
} }
} }

5
util/log.c
View File

@ -138,7 +138,7 @@ void qemu_set_log(int log_flags)
* *
* filename may be NULL. In that case, log output is sent to stderr * 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); g_free(logfilename);
logfilename = NULL; 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 */ /* We only accept one %d, no other format strings */
if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) { if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) {
error_setg(errp, "Bad logfile format: %s", filename); error_setg(errp, "Bad logfile format: %s", filename);
return; return false;
} else { } else {
logfilename = g_strdup_printf(filename, getpid()); logfilename = g_strdup_printf(filename, getpid());
} }
@ -160,6 +160,7 @@ void qemu_set_log_filename(const char *filename, Error **errp)
qemu_log_close(); qemu_log_close();
qemu_set_log(qemu_loglevel); qemu_set_log(qemu_loglevel);
return true;
} }
/* Returns true if addr is in our debug filter or no filter defined /* Returns true if addr is in our debug filter or no filter defined