From patchwork Sun Apr 17 18:30:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 562908 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp1892187map; Sun, 17 Apr 2022 12:17:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3Kul3dBWIxDl7gPwjQQD0gIKEMhMyLCqNp13cfzHpqDR0xzGfogznY+TC057As8/76W/6 X-Received: by 2002:ad4:5d49:0:b0:444:4dda:9ac1 with SMTP id jk9-20020ad45d49000000b004444dda9ac1mr5559716qvb.108.1650223064212; Sun, 17 Apr 2022 12:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650223064; cv=none; d=google.com; s=arc-20160816; b=G+i2jbLwpHP3Zeq1vS06bw87j1jcXwESRRhNwwIq1w6+0gYvOKC0xPo01RUyxmXvnS sJWl0tyfD9T3HcQ9iSTOFOLSDIRcLLmzfhylNG5+aF+ZLoQhgEkWZC1w7lZnyBbrkbSt aCoJ7prJYKN3EaZEuIJGuUq3CiFBecvVFJNVbyzmBB3+VhKBk4FzhKODqsmzdq4bUXil iI5v0E965p7WS1KZzWrHeT8aXfWs7gzGx4CwkDHXgs/Xa4nb/o3ym3wvqzNvWo7lnGa8 IeehP10rFxCnMJ+wKyVAPrSBH0GYgcJPjSLo9pcLHeR/IiLIpnlQaJjEyew4VjGRlbCN vQiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=h+yT2/MjJCx26TDMAi2TGagAsn9gW0LsB4wUZWDRCJ8=; b=AbTyj5hVEdZs2gERWW83Y1kWhDlTcB6j+s6UJkSCekVF0v8lUjzx6M3x35/ReGhHnp bN1dSYBfZ+ipW/nP2C7R8o4aMpKMDVmFEKwOmiqI+K/A709/gP/Z5eAEeLblRkrtGWNK jZdwqdhUyMr1nFb9SA/Ov60fQRGL58an4YO3WDd8EePPoMlKv/urLdpXIQkOmG8AcNp7 RB7bhvvGeWPyZUsk9C2VxfdnI/bvH1Pox3rWQXFH0638jB3rp81PqLj8hz8ldM+GMA+g HFy+kZZ9K4m5qmbGjtL0Z5NsupNRtqYIhAO11zouWZLiLk/HNK55vVs7UmUERI5YY7jK YG6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wHU1PjLD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s8-20020a05620a030800b0067e4be23a9fsi2174752qkm.740.2022.04.17.12.17.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Apr 2022 12:17:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wHU1PjLD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngAP1-0001DM-Px for patch@linaro.org; Sun, 17 Apr 2022 15:17:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng9fo-0000XN-2w for qemu-devel@nongnu.org; Sun, 17 Apr 2022 14:31:00 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:39773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng9ff-0001qn-Nw for qemu-devel@nongnu.org; Sun, 17 Apr 2022 14:30:59 -0400 Received: by mail-pl1-x631.google.com with SMTP id c12so10789470plr.6 for ; Sun, 17 Apr 2022 11:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h+yT2/MjJCx26TDMAi2TGagAsn9gW0LsB4wUZWDRCJ8=; b=wHU1PjLD1DhdFFl69F5s2tyEnphs18Fro4Upu9f1KjGLZZDsEMrruXrin2IcGdC0TS 2erYlrYworgh22O3+F1I+Nv3lQhkDgTrgQCFgVRGfbwlk9eBuDW0ga86hxGrIKLfXKUo PhDInksv4HIWI/596UFuEnNWhqB1KAt9ozrbqcsOQgoTNBvCZWqR5zzs//HAc8OdQ7hC E4t40rIy9Jz071wgWsbK450awj1HBlI+plzbKfiJxg7cb7Eg+llzHttxMShwvz5UQg4a UgtW8U1od7TEho0EFtpKvcfpDaOn/mfxyh4qVH24K1dgfzPvf4QNu1l6WKhTxb9l9BWa vqPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h+yT2/MjJCx26TDMAi2TGagAsn9gW0LsB4wUZWDRCJ8=; b=4tlF+Ntp1Rvy2tJim8Pfb2ntQ0Y/ie7Fr6lIUle+dfh5g3YD+lHIHf5dB6z++j35zn JdHXb9ggpUarC++kytvWt6azQ15ZYzQJ+h/aDuEccxzI/d+tMN+54jVWtB+XDWDm5x4w AESjM8uJSzr0H10SixzaWtLHJmpDWanwvrXNiT/gKA+x+Wj71DUuQa5agTqyqh/eZ8uY KM29xNm78Iujv76ouVI2eXOUqqxlGw4GxdPPC6WTzRiIk9sE3cSGTQ/QRhLLZ2zPmxwR 7ORV/CsvBRKSdrMNGX68p25QdKD/hoK6Liw0KuKJjc2lj2XThOeeLEcZmVU769rWweOQ p3pQ== X-Gm-Message-State: AOAM530a//ZbCZqYZMgDsogNw+0MKUaHg7D7ftXMNyZYg2Mlv5PDxQkn jJO/+oH3tWD7QHjDuqnpRUsid5rghtiSRA== X-Received: by 2002:a17:90b:4f4e:b0:1cd:49fa:911d with SMTP id pj14-20020a17090b4f4e00b001cd49fa911dmr9140774pjb.26.1650220248082; Sun, 17 Apr 2022 11:30:48 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id on10-20020a17090b1d0a00b001d08a7d569csm8154011pjb.56.2022.04.17.11.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 11:30:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 33/39] util/log: Rename qemu_logfile to global_file Date: Sun, 17 Apr 2022 11:30:13 -0700 Message-Id: <20220417183019.755276-34-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417183019.755276-1-richard.henderson@linaro.org> References: <20220417183019.755276-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename to emphasize this is the file-scope global variable. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- util/log.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/util/log.c b/util/log.c index b3f79deb6c..425f0064b0 100644 --- a/util/log.c +++ b/util/log.c @@ -36,7 +36,7 @@ typedef struct QemuLogFile { static char *global_filename; static QemuMutex qemu_logfile_mutex; -static QemuLogFile *qemu_logfile; +static QemuLogFile *global_file; int qemu_loglevel; static int log_append = 0; static GArray *debug_regions; @@ -44,7 +44,7 @@ static GArray *debug_regions; /* Returns true if qemu_log() will really write somewhere. */ bool qemu_log_enabled(void) { - return qemu_logfile != NULL; + return global_file != NULL; } /* Returns true if qemu_log() will write somewhere other than stderr. */ @@ -54,7 +54,7 @@ bool qemu_log_separate(void) bool res = false; rcu_read_lock(); - logfile = qatomic_rcu_read(&qemu_logfile); + logfile = qatomic_rcu_read(&global_file); if (logfile && logfile->fd != stderr) { res = true; } @@ -69,7 +69,7 @@ FILE *qemu_log_trylock(void) QemuLogFile *logfile; rcu_read_lock(); - logfile = qatomic_rcu_read(&qemu_logfile); + logfile = qatomic_rcu_read(&global_file); if (logfile) { qemu_flockfile(logfile->fd); return logfile->fd; @@ -124,7 +124,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, QemuLogFile *logfile; QEMU_LOCK_GUARD(&qemu_logfile_mutex); - logfile = qemu_logfile; + logfile = global_file; if (changed_name) { char *newname = NULL; @@ -156,7 +156,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, filename = newname; if (logfile) { - qatomic_rcu_set(&qemu_logfile, NULL); + qatomic_rcu_set(&global_file, NULL); call_rcu(logfile, qemu_logfile_free, rcu); logfile = NULL; } @@ -179,7 +179,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, need_to_open_file = log_flags && (!is_daemonized() || filename); if (logfile && !need_to_open_file) { - qatomic_rcu_set(&qemu_logfile, NULL); + qatomic_rcu_set(&global_file, NULL); call_rcu(logfile, qemu_logfile_free, rcu); return true; } @@ -210,7 +210,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, logfile = g_new0(QemuLogFile, 1); logfile->fd = fd; - qatomic_rcu_set(&qemu_logfile, logfile); + qatomic_rcu_set(&global_file, logfile); } return true; }