From patchwork Thu Feb 13 22:50:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183443 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1083856ile; Thu, 13 Feb 2020 14:59:52 -0800 (PST) X-Google-Smtp-Source: APXvYqyAPfhzhBdbs8lcJLH1faF5hPSeYEr2K+jcqopglP+Kwt+JdS2FDsdLyxRv0QuVcrbAsd7K X-Received: by 2002:ac8:4a16:: with SMTP id x22mr304754qtq.339.1581634792040; Thu, 13 Feb 2020 14:59:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581634792; cv=none; d=google.com; s=arc-20160816; b=kMCUpRfMcx8p4Lk4bG59o11ha5hdJJPWlz6FhAAfF9/tr6N9bfOaLoz2Y7YYOwJ1bf kibfMloHTZ4oo2MSofe3u5wl+OwyQeDTulgTZ/PU55Mjf/NAte3qvad4Q38uHoPUimRW WEM09qM6p/6ze67sxNnb2yB5kF8B5FC8d9ax0e2IPfPJy4VIzGa21Q729oZqgUfeCU96 llMqVl2GclQmYwmjb48qT9UJMGj6LY0uYlLE4KbPH7M40Oi0967DLnbvkRZMtZoJ3LK0 xuBUyPfaN6RK5Xzu1xbclmQqXmFuQE3UxPdNMxkcRNL53Bu+ffeTdi9uGBfuaU59EeHV lgHg== 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=xiuLr2bgSRxDP5CJng9ok5G0lC9iDI/XVskdjRAUAgg=; b=eIwp7fvtn5lVNJUsXsy+Ftipb8XhjTqrdvLI6AyRTrFMF1pmM9gOsVqMguN33R1vyK v/AdDOl/ZIGGM+qy4nmwlEyv0l7hvykvMCx0clArA8c3fSshWl3+chWCXqIeqw/6aWDx IZcacUMHJr0C3M76LueYdfEfmfpXTCOSDTY8I610htM7vd6r4z2leWEHH2Lik23LF8PT Y0bL5PfBzhpmw/Oy6BoTSHTWSwz0GjXFC/nJaNF9WCbCGL2HV1DqlGZR19GHTut+60Y6 08CwA5TLfj6r4WfsjATj/eFkYf49O38jqyIX5qsp5bXt2Qe7wlYPM0zQD9NnuM0VC5un WNDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=agxIFFq7; 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=fail (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 c7si1636099qvs.223.2020.02.13.14.59.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 14:59:52 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=agxIFFq7; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2NSZ-0000fA-Hi for patch@linaro.org; Thu, 13 Feb 2020 17:59:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40098) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2NKT-00054V-Qb for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2NKS-00045k-Nz for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:29 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2NKS-00044J-Hv for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:28 -0500 Received: by mail-wr1-x441.google.com with SMTP id t3so8743687wru.7 for ; Thu, 13 Feb 2020 14:51:28 -0800 (PST) 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=xiuLr2bgSRxDP5CJng9ok5G0lC9iDI/XVskdjRAUAgg=; b=agxIFFq7U6KXmq8jycm7mz8QZkjoKJOFtMkI+LTnroDyl3sQ+GWdwG/UpMaER6zmdt DzsgFWvRZeVmUuVLyReyGX37X9+poCJELXx8R7ZC1aUpqgNY71mxSOR83KdjZlnofQ9S Z1VKVeVDynaNviHwk8NzGb9z9q+Mgfq62eQMb0+8EjyRPSbGR5LVrhId69XfPbdOkQJT oEHTUihWmfQSKmFfv7VdotOJJVL7r4WyCDvMRgDtgQePozKo7AWbJAq4/YUEO5e3M9xU zGJDzMHE+kiKC3q/fRdDT4jJWgyi5q+/XQURahNyLhZ8VkKqmWo5DpKp8kWdhecfRj+D MwGw== 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=xiuLr2bgSRxDP5CJng9ok5G0lC9iDI/XVskdjRAUAgg=; b=G4YUQzFgVtPmwF0xq8+OZxfzShkrCIYj54i57lAviy1oNh8r9Q2s9OWeTLCseNJtWZ ThzCK5GAFqOUUatUyN23EuqVd6ldwkA8Is5kILwk2ekODV/G7sFt3q6fvc7V+W508Y/C etvaRj4GL+0SLgosFns9O9hOY9HRemjKcP7bJQKJY0g1HkkRaEiaq6D5GP3SPf1lnDSi AuB6voLt/r8pKm01MwK78eOIYZKTCvhiI6QAX6UbI11FKrQCVHZRBIDtxvbHe0+Y/WCf b+PFH3zLG6NmxsL5F5ZXt1trUt6CEFQdwS238woVW47trfJ/qlTjAEqsVFqnX2xYeMcy AgxQ== X-Gm-Message-State: APjAAAXNwFhl7fEQLrEmbtgpBaPf/FYCwQ+zg4yfrNb/FjTDxD4KkNCp QzRJncSqvz1ERiArG+OWc/y0SA== X-Received: by 2002:adf:ca07:: with SMTP id o7mr23308629wrh.49.1581634287601; Thu, 13 Feb 2020 14:51:27 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s15sm4309836wrp.4.2020.02.13.14.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 14:51:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6BBD91FF99; Thu, 13 Feb 2020 22:51:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/19] tracing: only allow -trace to override -D if set Date: Thu, 13 Feb 2020 22:50:59 +0000 Message-Id: <20200213225109.13120-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213225109.13120-1-alex.bennee@linaro.org> References: <20200213225109.13120-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, robert.foley@linaro.org, pbonzini@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , richard.henderson@linaro.org, f4bug@amsat.org, robhenry@microsoft.com, marcandre.lureau@redhat.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Otherwise any -D settings the user may have made get ignored. Signed-off-by: Alex Bennée --- trace/control.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.20.1 Reviewed-by: Robert Foley diff --git a/trace/control.c b/trace/control.c index 6c775e68eba..2ffe0008184 100644 --- a/trace/control.c +++ b/trace/control.c @@ -226,10 +226,15 @@ void trace_init_file(const char *file) #ifdef CONFIG_TRACE_SIMPLE st_set_trace_file(file); #elif defined CONFIG_TRACE_LOG - /* If both the simple and the log backends are enabled, "--trace file" - * only applies to the simple backend; use "-D" for the log backend. + /* + * If both the simple and the log backends are enabled, "--trace file" + * only applies to the simple backend; use "-D" for the log + * backend. However we should only override -D if we actually have + * something to override it with. */ - qemu_set_log_filename(file, &error_fatal); + if (file) { + qemu_set_log_filename(file, &error_fatal); + } #else if (file) { fprintf(stderr, "error: --trace file=...: "