From nobody Fri Nov 7 12:57:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538755219483519.3856114950183; Fri, 5 Oct 2018 09:00:19 -0700 (PDT) Received: from localhost ([::1]:35757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8SWP-0001fW-4T for importer@patchew.org; Fri, 05 Oct 2018 12:00:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8SMA-0006aK-5P for qemu-devel@nongnu.org; Fri, 05 Oct 2018 11:49:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8SM8-0006Cb-Ia for qemu-devel@nongnu.org; Fri, 05 Oct 2018 11:49:34 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:43510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g8SM8-00064t-2g for qemu-devel@nongnu.org; Fri, 05 Oct 2018 11:49:32 -0400 Received: by mail-wr1-x42a.google.com with SMTP id n1-v6so14043033wrt.10 for ; Fri, 05 Oct 2018 08:49:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 90-v6sm7096634wrg.86.2018.10.05.08.49.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Oct 2018 08:49:15 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6EE673E0634; Fri, 5 Oct 2018 16:49:11 +0100 (BST) 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=w8gM7VL+X/yF2wQLvNV3izfa85PWeYk7XF0I+Hzlb3g=; b=WF9z9ef+0P06Hm6YT5dhQfsN1RdTbFfIOFURg2FSJf7Vb62SHPq3rqlGlv+AmFpiZl Lb5zoYF0R+G/lcBAp9KDxOWTcM4Uf77GNXi9exHKcyEwehjmn7g8WdP7kMLrEJceEBze wmpRkpDrfWLKMcnZHlUdSVG4iHNlljUCg+9Ys= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w8gM7VL+X/yF2wQLvNV3izfa85PWeYk7XF0I+Hzlb3g=; b=CCb1P+nQHU1HkgVtiJAT05cIkcfaxwmilWr1ltN6hc5ZpOqtTHev59/8iGaqcXI2mZ Dn3RzraKSQQxc6OBSlTNYpalopBHpIV76qyU816TtldLcYamEW7PLCA6ZD4OVjdo47pe 6zd8HihsGCBFGbVqe8hmixQxU4r5FmTtATIuQNw1ugACQL/+JPg1jKk+7Bp/mEp1+RCm WSXWRFBEe7S5OMGItByvO2FE7XdV5rFpKk/d+S/XeR+dXLU74hRFYDmwbiDa11ebUQI7 DBOtNZH1wdn//dQH+ITmtAW2HGLPQgxzMVDJffKZtD3yEfp6Nl79kmDB3alpThRtr9sZ 8L9A== X-Gm-Message-State: ABuFfoiAZl1q6vNxNZWXKhnAuZz8b9rV5UIRzIiiaBIuKSgv3NEvhEe1 U+2SlnBtx7wITue4gQRp8U3ItA== X-Google-Smtp-Source: ACcGV63TO3VfghP9heUSOBg2ZrZcSsJFdEi/J6bh7DXyl1hER4u5ioFzAw9HHnGZNywr6PqxRUW3ZQ== X-Received: by 2002:a5d:5701:: with SMTP id a1-v6mr9209209wrv.289.1538754561195; Fri, 05 Oct 2018 08:49:21 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 5 Oct 2018 16:48:58 +0100 Message-Id: <20181005154910.3099-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181005154910.3099-1-alex.bennee@linaro.org> References: <20181005154910.3099-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [RFC PATCH 09/21] trace: suppress log output of trace points X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , cota@braap.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , vilanova@ac.upc.edu, Pavel.Dovgaluk@ispras.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 When multiple tracers are enabled and you want to save to binary we shouldn't assume the user also wants to spam the log. They can always override it manually if they want. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- util/log.c | 3 --- vl.c | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/util/log.c b/util/log.c index cc79a146d1..5759bf571f 100644 --- a/util/log.c +++ b/util/log.c @@ -56,9 +56,6 @@ static bool log_uses_own_buffers; void qemu_set_log(int log_flags) { qemu_loglevel =3D log_flags; -#ifdef CONFIG_TRACE_LOG - qemu_loglevel |=3D LOG_TRACE; -#endif if (!qemu_logfile && (is_daemonized() ? logfilename !=3D NULL : qemu_loglevel)) { if (logfilename) { diff --git a/vl.c b/vl.c index a867c9c4d9..795e025445 100644 --- a/vl.c +++ b/vl.c @@ -2908,6 +2908,7 @@ int main(int argc, char **argv, char **envp) Error *err =3D NULL; bool list_data_dirs =3D false; char *dir, **dirs; + int maybe_log_trace =3D 0; typedef struct BlockdevOptions_queue { BlockdevOptions *bdo; Location loc; @@ -3985,6 +3986,19 @@ int main(int argc, char **argv, char **envp) } trace_init_file(trace_file); =20 +#if defined(CONFIG_TRACE_SIMPLE) && defined(CONFIG_TRACE_LOG) + /* If the user has both log and simple tracing enabled but hasn't + * defined a binary trace file ensure we enable the right logging + * flags. + */ + if (!trace_file) { + maybe_log_trace =3D LOG_TRACE; + } +#elif defined CONFIG_TRACE_LOG + /* with just CONFIG_TRACE_LOG we enable unconditionally */ + maybe_log_trace =3D LOG_TRACE; +#endif + /* Open the logfile at this point and set the log mask if necessary. */ if (log_file) { @@ -3998,9 +4012,9 @@ int main(int argc, char **argv, char **envp) qemu_print_log_usage(stdout); exit(1); } - qemu_set_log(mask); + qemu_set_log(mask | maybe_log_trace); } else { - qemu_set_log(0); + qemu_set_log(maybe_log_trace); } =20 /* add configured firmware directories */ --=20 2.17.1