aboutsummaryrefslogtreecommitdiff
path: root/hw/net
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-04-17 11:29:47 -0700
committerRichard Henderson <richard.henderson@linaro.org>2022-04-20 10:51:11 -0700
commitc60f599bcb9bf9256eb87c1c60add55d23f76de3 (patch)
tree826787db9c46fdd8c85f1e766e789ae186312e23 /hw/net
parentc59fe6e536adfb2d6f3410f19d592496933f68de (diff)
downloadqemu-c60f599bcb9bf9256eb87c1c60add55d23f76de3.zip
qemu-c60f599bcb9bf9256eb87c1c60add55d23f76de3.tar.gz
qemu-c60f599bcb9bf9256eb87c1c60add55d23f76de3.tar.bz2
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 'hw/net')
-rw-r--r--hw/net/can/can_sja1000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index 3ba803e..300313d 100644
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -247,7 +247,7 @@ int can_sja_accept_filter(CanSJA1000State *s,
static void can_display_msg(const char *prefix, const qemu_can_frame *msg)
{
int i;
- FILE *logfile = qemu_log_lock();
+ FILE *logfile = qemu_log_trylock();
qemu_log("%s%03X [%01d] %s %s",
prefix,