[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-7.1 21/36] include/exec/log: Do not reference QemuLogFile dire
From: |
Richard Henderson |
Subject: |
[PULL for-7.1 21/36] include/exec/log: Do not reference QemuLogFile directly |
Date: |
Sun, 20 Mar 2022 10:11:20 -0700 |
Use qemu_log_lock/unlock instead of the raw rcu_read.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/log.h | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/include/exec/log.h b/include/exec/log.h
index ad0a40cfeb..10d0e809d4 100644
--- a/include/exec/log.h
+++ b/include/exec/log.h
@@ -15,15 +15,10 @@
*/
static inline void log_cpu_state(CPUState *cpu, int flags)
{
- QemuLogFile *logfile;
-
- if (qemu_log_enabled()) {
- rcu_read_lock();
- logfile = qatomic_rcu_read(&qemu_logfile);
- if (logfile) {
- cpu_dump_state(cpu, logfile->fd, flags);
- }
- rcu_read_unlock();
+ FILE *f = qemu_log_lock();
+ if (f) {
+ cpu_dump_state(cpu, f, flags);
+ qemu_log_unlock(f);
}
}
--
2.25.1
- [PULL for-7.1 29/36] util/log: Rename logfilename to global_filename, (continued)
- [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
- [PULL for-7.1 12/36] exec/log: Remove log_disas and log_target_disas, Richard Henderson, 2022/03/20
- [PULL for-7.1 15/36] util/log: Use qemu_log_lock/unlock in qemu_log, Richard Henderson, 2022/03/20
- [PULL for-7.1 18/36] bsd-user: Expand log_page_dump inline, Richard Henderson, 2022/03/20
- [PULL for-7.1 19/36] linux-user: Expand log_page_dump inline, Richard Henderson, 2022/03/20
- [PULL for-7.1 17/36] util/log: Drop call to setvbuf, Richard Henderson, 2022/03/20
- [PULL for-7.1 21/36] include/exec/log: Do not reference QemuLogFile directly,
Richard Henderson <=
- [PULL for-7.1 22/36] include/qemu/log: Move entire implementation out-of-line, Richard Henderson, 2022/03/20
- [PULL for-7.1 24/36] util/log: Introduce qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 23/36] sysemu/os-win32: Test for and use _lock_file/_unlock_file, Richard Henderson, 2022/03/20
- [PULL for-7.1 26/36] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 27/36] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 28/36] util/log: Remove qemu_log_close, Richard Henderson, 2022/03/20
- [PULL for-7.1 31/36] util/log: Rename qemu_logfile_mutex to global_mutex, Richard Henderson, 2022/03/20
- [PULL for-7.1 33/36] util/log: Combine two logfile closes, Richard Henderson, 2022/03/20
- [PULL for-7.1 35/36] util/log: Limit RCUCloseFILE to file closing, Richard Henderson, 2022/03/20
- [PULL for-7.1 32/36] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal, Richard Henderson, 2022/03/20