diff options
| author | Richard Henderson | 2022-04-17 20:29:47 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-04-20 19:51:11 +0200 |
| commit | c60f599bcb9bf9256eb87c1c60add55d23f76de3 (patch) | |
| tree | 826787db9c46fdd8c85f1e766e789ae186312e23 /net/can | |
| parent | util/log: Move qemu_log_lock, qemu_log_unlock out of line (diff) | |
| download | qemu-c60f599bcb9bf9256eb87c1c60add55d23f76de3.tar.gz qemu-c60f599bcb9bf9256eb87c1c60add55d23f76de3.tar.xz 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 'net/can')
| -rw-r--r-- | net/can/can_socketcan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index 4b68f60c6b..4a505643e9 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -76,7 +76,7 @@ QEMU_BUILD_BUG_ON(offsetof(qemu_can_frame, data) static void can_host_socketcan_display_msg(struct qemu_can_frame *msg) { int i; - FILE *logfile = qemu_log_lock(); + FILE *logfile = qemu_log_trylock(); qemu_log("[cansocketcan]: %03X [%01d] %s %s", msg->can_id & QEMU_CAN_EFF_MASK, msg->can_dlc, |