From nobody Tue Feb 10 11:15:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1648304267; cv=none; d=zohomail.com; s=zohoarc; b=Ro7Ys8T6O+y41QdTGfHeBIRstvxFQNm94na1TWxc8gA3MKlElMfijxkq6wgsTEE0fXmtlk+2Pj90Rp+3hKmAoMypOSSXiLBwutHURUHnads+efgmHaFjZlYbHysvna9MR2TSpWuwmabwm5RKJoxK/lVQVlwNQlHj09VGN5Cgl14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648304267; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=31e7uABinGNdcjY/s1pEdjv5HJDeYHfqF6kH7oc0qxw=; b=I/swAUHtAY8APmr73psJ6gxu6FcRIWCQJbsgDZOavute5dnXKAh7rpqol0rUrmQVjrZvZtDgDkwoe63M+sByiimd/DhOWQkewIY2wktDstWpYrJav7Pj9vhkPSo4/LJxgQXf9CTt6T+YrxcA6G4yj6zxHy8URc+4Xo7UB1BtZTk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648304267964197.12189402805927; Sat, 26 Mar 2022 07:17:47 -0700 (PDT) Received: from localhost ([::1]:56912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7Eg-0004xu-EJ for importer@patchew.org; Sat, 26 Mar 2022 10:17: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) 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) 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-Google-Smtp-Source: ABdhPJybvmO8BwbGzHAcWAqK5LSoeyyEJAScbl00vHfe/fj28JeRcMd2Nx+tZEdj4q2aRfPQsy9H0Q== 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) 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 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1648304269617100001 Content-Type: text/plain; charset="utf-8" Rename to emphasize this covers the file-scope global variables. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- 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; =20 +/* 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 =3D 0; static GArray *debug_regions; @@ -101,9 +103,9 @@ void qemu_log(const char *fmt, ...) } } =20 -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); } =20 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; =20 - QEMU_LOCK_GUARD(&qemu_logfile_mutex); + QEMU_LOCK_GUARD(&global_mutex); logfile =3D global_file; =20 if (changed_name) { --=20 2.25.1