diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-04-17 11:29:47 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-04-20 10:51:11 -0700 |
| commit | c60f599bcb9bf9256eb87c1c60add55d23f76de3 (patch) | |
| tree | 826787db9c46fdd8c85f1e766e789ae186312e23 /include | |
| parent | c59fe6e536adfb2d6f3410f19d592496933f68de (diff) | |
| download | focaccia-qemu-c60f599bcb9bf9256eb87c1c60add55d23f76de3.tar.gz focaccia-qemu-c60f599bcb9bf9256eb87c1c60add55d23f76de3.zip | |
util/log: Rename qemu_log_lock to qemu_log_trylock
This function can fail, which makes it more like ftrylockfile or pthread_mutex_trylock than flockfile or pthread_mutex_lock, so rename it. To closer match the other trylock functions, release rcu_read_lock along the failure path, so that qemu_log_unlock need not be called on failure. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220417183019.755276-8-richard.henderson@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/log.h | 2 | ||||
| -rw-r--r-- | include/qemu/log.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/exec/log.h b/include/exec/log.h index 3c7fa65ead..fb595d1eb7 100644 --- a/include/exec/log.h +++ b/include/exec/log.h @@ -71,7 +71,7 @@ static inline void log_disas(const void *code, unsigned long size) /* page_dump() output to the log file: */ static inline void log_page_dump(const char *operation) { - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); if (logfile) { qemu_log("page layout changed following %s\n", operation); page_dump(logfile); diff --git a/include/qemu/log.h b/include/qemu/log.h index 6a6b1efce5..d090faf22a 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -67,7 +67,7 @@ static inline bool qemu_log_separate(void) /* Lock/unlock output. */ -FILE *qemu_log_lock(void); +FILE *qemu_log_trylock(void); void qemu_log_unlock(FILE *fd); /* Logging functions: */ |