[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-7.1 06/36] util/log: Treat qemu_log_lock like trylock
From: |
Richard Henderson |
Subject: |
[PULL for-7.1 06/36] util/log: Treat qemu_log_lock like trylock |
Date: |
Sun, 20 Mar 2022 10:11:05 -0700 |
Do not require qemu_log_unlock to be called when
qemu_log_lock returns NULL.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
util/log.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util/log.c b/util/log.c
index 248db6211e..b1651d8122 100644
--- a/util/log.c
+++ b/util/log.c
@@ -39,12 +39,14 @@ static GArray *debug_regions;
FILE *qemu_log_lock(void)
{
QemuLogFile *logfile;
+
rcu_read_lock();
logfile = qatomic_rcu_read(&qemu_logfile);
if (logfile) {
qemu_flockfile(logfile->fd);
return logfile->fd;
} else {
+ rcu_read_unlock();
return NULL;
}
}
@@ -53,8 +55,8 @@ void qemu_log_unlock(FILE *fd)
{
if (fd) {
qemu_funlockfile(fd);
+ rcu_read_unlock();
}
- rcu_read_unlock();
}
/* Return the number of characters emitted. */
--
2.25.1
- [PULL for-7.1 11/36] exec/translator: Pass the locked filepointer to disas_log hook, (continued)
- [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
- [PULL for-7.1 05/36] util/log: Move qemu_log_lock, qemu_log_unlock out of line, Richard Henderson, 2022/03/20
- [PULL for-7.1 06/36] util/log: Treat qemu_log_lock like trylock,
Richard Henderson <=
- [PULL for-7.1 29/36] util/log: Rename logfilename to global_filename, Richard Henderson, 2022/03/20
- [PULL for-7.1 30/36] util/log: Rename qemu_logfile to global_file, Richard Henderson, 2022/03/20
- [PULL for-7.1 09/36] util/log: Remove qemu_log_vprintf, Richard Henderson, 2022/03/20
- [PULL for-7.1 10/36] tcg: Pass the locked filepointer to tcg_dump_ops, Richard Henderson, 2022/03/20
- [PULL for-7.1 13/36] accel/tcg: Use cpu_dump_state between qemu_log_lock/unlock, Richard Henderson, 2022/03/20