From patchwork Sat Mar 26 13:25:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554390 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp6457955mag; Sat, 26 Mar 2022 07:16:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTzbjsxf1k6klQJw3s5itf/13Cv3/Kp1foYUrK4XcvvR/ddDkViyeFcyaFXNtZjZZZA2xJ X-Received: by 2002:a05:622a:1808:b0:2e0:6d99:a782 with SMTP id t8-20020a05622a180800b002e06d99a782mr13943622qtc.406.1648304207220; Sat, 26 Mar 2022 07:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648304207; cv=none; d=google.com; s=arc-20160816; b=ah+YovwTD0s8w62vlBHGoLA/qEFeczitvGklqEViGdgqVLWN3lp7U43cm1H7Zod/yZ 2x+hPAr9o3rsJC7R1427bZ+IzD9lXig6VqHzK6XhBPQt+/1AyLYYX+XfzBJhtQ1Ci3ms ysYnhOBZZikpAokd6GHsD7xFb+TDTFM/XvYtceGuq1bSyW1Nrit3smtnkyQQ//839qEZ 0lHk8eI05msPm+F6awSUNOZ0u8alG2wmM4A/Cl9d0NpbzWneob86hvEqwgah+VYrV7t1 v1pEVUh0j89gfM+SMmKyNYPQU1A8pYdv3mN/Bmpn70nUXdeRCWHIh7C6nFEJWJ9c13T9 mjVw== 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=31e7uABinGNdcjY/s1pEdjv5HJDeYHfqF6kH7oc0qxw=; b=rlHSUnIJ7XCMsdf11OGVchKWyiYRCxUhezMA9Cv6JHn0NLsH2CFGORT6HupGMTwBrN Ai2Qy2GkkYoaBUjOMTQrOxycftsdbrc2eGrSh4nyUhr9nNFOjQASujsNUEcUvhOnLB6x Xb7FHZjzf5At1iBvkhUX3S3E+uu8nZCHytjyvAsnjnzjyi9ByqaD9WB9qvNrnhybYBFh 39/ps1dD/j7frhvI81RYLJAxKjjJia3Ts8PH8p0ypAVzRHkwpaSN8fAYxAfieu5xadj1 qvErmF1vVrZzwYr7KnArls32PNG1j+DdAl4oDiFjA4MN0crLUv4mGLAnvZ6Ic/xC5dEQ NK5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BIMpVWQu; 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 j184-20020a3787c1000000b0067e4be23ab6si2985328qkd.763.2022.03.26.07.16.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 Mar 2022 07:16:47 -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=BIMpVWQu; 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]:53904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7Di-0002p2-HD for patch@linaro.org; Sat, 26 Mar 2022 10:16:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6UB-0002sZ-RE for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:44 -0400 Received: from [2607:f8b0:4864:20::22b] (port=35702 helo=mail-oi1-x22b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY6UA-0005yh-Ft for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:29:43 -0400 Received: by mail-oi1-x22b.google.com with SMTP id e4so11104319oif.2 for ; Sat, 26 Mar 2022 06:29:42 -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=31e7uABinGNdcjY/s1pEdjv5HJDeYHfqF6kH7oc0qxw=; b=BIMpVWQukU8Pz45UwKC45D0tSbdN+9fkit1+duChgFwIlSy1BSvsunRjaF7IAc3vTg yBwuKpUDPd6DMy1IMmMfYqgakXWcC0ipKsQuXG2GWvxEJBTJA/rpFhnJbdYLW6eVyM40 hujFFz2muIsa9/DvAtvoWNQ92HbhtWJIu5C2sI7y9aA+5SPWbGdG2YZjTORfHjsxOF3K nwFRDFcryVI9UeqrCDUeHvBAeDXPBhOvvuIAln1Q9f5MAzO1QfHUU3xssh9TKH66IgU8 d3VGBh9ZvsDeNQC6UC1HaD2yr5iLkOtOAXgdY1gJJXJktMr74dT1V4vQaOYgx8YZiFhw qPRA== 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=31e7uABinGNdcjY/s1pEdjv5HJDeYHfqF6kH7oc0qxw=; b=3AuPV+ed8SWRfogBXwAKCOGywoiAzx3ml+WEQyUqKQiw6FP0X+5LZe2DAtcptl3IkI 4WS9BlPdUQiL/1DwJL+lrlAsgmr4lSiH6nUQs7NWXU7kt1LgupwW3hzRgfAYMJF8rZMg pYjEsagXD1oWwDxlLWT3ofsAlQGD3BJKgNxsOqM9vJQKRL2/dArb2dWT+495D6ajMfku 6quC4GcffDJKQjZKj+rglZYBfM7uJocBKH9pdmwzx5JF4IJqs3IpPVvOURw3PGLkpVjw VWudRMhUNypyKEcC3i5tsWzRW1kxlbyfgr7VVB8B/hOOja5kByUonMNpzh5XNduJFT8o kbEg== X-Gm-Message-State: AOAM53327aTvgc3j2yK2XqgNajnzxlYInN/yfHq7y3A1X87VMwQZMbiv /nUB8TsGEvamXG6c1C3Yu+A/d/QHkCoj30ex X-Received: by 2002:a05:6808:7c2:b0:2d9:cf1b:bb2f with SMTP id f2-20020a05680807c200b002d9cf1bbb2fmr7880225oij.287.1648301381553; Sat, 26 Mar 2022 06:29:41 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id s24-20020a056808209800b002da3b9bf8e0sm4394509oiw.32.2022.03.26.06.29.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:29:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 34/39] util/log: Rename qemu_logfile_mutex to global_mutex Date: Sat, 26 Mar 2022 07:25:29 -0600 Message-Id: <20220326132534.543738-43-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename to emphasize this covers the file-scope global variables. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- util/log.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/util/log.c b/util/log.c index 425f0064b0..bb201664ac 100644 --- a/util/log.c +++ b/util/log.c @@ -34,9 +34,11 @@ typedef struct QemuLogFile { FILE *fd; } QemuLogFile; +/* Mutex covering the other global_* variables. */ +static QemuMutex global_mutex; static char *global_filename; -static QemuMutex qemu_logfile_mutex; static QemuLogFile *global_file; + int qemu_loglevel; static int log_append = 0; static GArray *debug_regions; @@ -101,9 +103,9 @@ void qemu_log(const char *fmt, ...) } } -static void __attribute__((__constructor__)) qemu_logfile_init(void) +static void __attribute__((__constructor__)) startup(void) { - qemu_mutex_init(&qemu_logfile_mutex); + qemu_mutex_init(&global_mutex); } static void qemu_logfile_free(QemuLogFile *logfile) @@ -123,7 +125,7 @@ static bool qemu_set_log_internal(const char *filename, bool changed_name, bool need_to_open_file; QemuLogFile *logfile; - QEMU_LOCK_GUARD(&qemu_logfile_mutex); + QEMU_LOCK_GUARD(&global_mutex); logfile = global_file; if (changed_name) {