From nobody Mon May 6 15:22:31 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579533225; cv=none; d=zohomail.com; s=zohoarc; b=QEJ1AZaR0ufeOtylD++0Gb6vj+7ywoxmRdFDyrLpntmU6wB88hj6mR9/+BvLKQdmSGeIeq9gVDL8pvmy0fhn0qK+74HiKaHP4tT+4OpGgifXHv7n2SfD7r6vv6Hs/GYHDDghEQYbUSyPgwl1xfEtmhw3TTnY2PhMkiGf0otAwjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579533225; 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=QOlYVQbhK3uxfa0fBYUIEX4IDujmYIqF+cSXeERZjfU=; b=aKH8G3PrEjoN9gwpeaBgec6yI4txbZ9Mziv9jYl0STuA3EeFY7p4UQ0rxPIaSNwtlgN63TED8UKVKE11I4z9baFGq5Hds1AwO0PYQZvTOkxQHeMXbg8tjLOJ9LdJWpaCYmZCrOrOYmFd47ZQ9/SVxvvgYMW4z0ZJTWszsOjvBfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579533225963511.6420942061435; Mon, 20 Jan 2020 07:13:45 -0800 (PST) Received: from localhost ([::1]:38428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itYkJ-0001yp-5q for importer@patchew.org; Mon, 20 Jan 2020 10:13:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47483) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itYiV-0000ET-6B for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itYiR-0008Km-PJ for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:50 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40420) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itYiR-0008KS-JE for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:47 -0500 Received: by mail-wm1-x343.google.com with SMTP id t14so15048903wmi.5 for ; Mon, 20 Jan 2020 07:11:47 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm817919wmc.8.2020.01.20.07.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 07:11:45 -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=QOlYVQbhK3uxfa0fBYUIEX4IDujmYIqF+cSXeERZjfU=; b=gzddz73zO6fGsc/ZWn+pX3n5TwUHqyQoErZijB3Qf36+gNsTUWaRT8yTzQwBLI1hFX a44LHcRz/GhcGlSZyiRDjMuJXWgKKzmst9m5lPNpwJahgz0uX1Ul7rftfsIzebjTZ5l7 hRUy3XfMQDRSL6QZcbO71NwYFikaUtRrI0fPrIiXCNDbUbyQQjdBFiCv8Hn8IuyvItLc lwYuXk/BQsGL+0N4P/GBX1Z2FjwFtr8DIc0FP/z+v3y1MuhHq3gshP3qvBASEOKAdxtR a3U6DmXZ5H8W8GYI+w4lKzVLazrD9z++k2bI1Bq10gb1pj+y+pnZ2SD2Om8P3/Ef3Nmm rt9A== 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=QOlYVQbhK3uxfa0fBYUIEX4IDujmYIqF+cSXeERZjfU=; b=Q67SJBcp/nkFENXHQkmoNaD9CYSE8xm+bvDAIOQqqiCOsx4yf410dNCPyuQyVDzJwG sNHyHFp0gRTagaGjAYAXWOzGH8+Ns69djjCOro5XtOCbR/9jGk+V8/6jcRt5AYmYk2Hv E9S/ssdwNnlYiKPWpaJW26lj2/2lSIz5MljRqHYBNEhNLy4gGuPW4Zs+Ezay5b1+kXpJ wKpDASEv07ctGhnx/pcSc5H35KSwmCPkbItxPGf0ov+LyFwPB03Uk9+mMkjmOIjOnfpF 36F/CuuKa83zttkfzbrnh4+d2OfxRU8/ZTWewLtREnE+3Any4XkADjYKGibfdYQ8i9d0 lJqg== X-Gm-Message-State: APjAAAUJXSvYKip2vtWA34NXsy+N8zXUT+yiJjYvp3lOzzMZR1F12+BS mtQLiYv5zxfMM+IPJlmaJbdIay4E93JazA== X-Google-Smtp-Source: APXvYqzKXRQxfiJpw0NWeCNAk0o0HA7zpZtjx00Y3U1ZadzeXPKVW9GE3/FG1BcI6BpjsS0cvOQmvw== X-Received: by 2002:a7b:c183:: with SMTP id y3mr18611726wmi.45.1579533106313; Mon, 20 Jan 2020 07:11:46 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/3] docs/devel/tracing.txt: Recommend only trace_event_get_state_backends() Date: Mon, 20 Jan 2020 15:11:40 +0000 Message-Id: <20200120151142.18954-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200120151142.18954-1-peter.maydell@linaro.org> References: <20200120151142.18954-1-peter.maydell@linaro.org> MIME-Version: 1.0 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::343 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: Paolo Bonzini , Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instead of recommending checking the TRACE_FOO_ENABLED macro to skip expensive computations needed only for tracing, recommend only using trace_event_get_state_backends(). This works for both compile-time and run-time disabling of events, and has no extra performance impact if the event is compile-time disabled. Signed-off-by: Peter Maydell --- docs/devel/tracing.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt index 8c0376fefa4..cb5f685de9f 100644 --- a/docs/devel/tracing.txt +++ b/docs/devel/tracing.txt @@ -342,8 +342,10 @@ edit the "trace-events-all" file). =20 In addition, there might be cases where relatively complex computations mu= st be performed to generate values that are only used as arguments for a trace -function. In these cases you can use the macro 'TRACE_${EVENT_NAME}_ENABLE= D' to -guard such computations and avoid its compilation when the event is disabl= ed: +function. In these cases you can use 'trace_event_get_state_backends()' to +guard such computations, so they are skipped if the event has been either +compile-time disabled or run-time disabled. If the event is compile-time +disabled, this check will have no performance impact. =20 #include "trace.h" /* needed for trace event prototype */ =20 @@ -356,7 +358,7 @@ guard such computations and avoid its compilation when = the event is disabled: align =3D getpagesize(); } ptr =3D qemu_memalign(align, size); - if (TRACE_QEMU_VMALLOC_ENABLED) { /* preprocessor macro */ + if (trace_event_get_state_backends(TRACE_QEMU_VMALLOC)) { void *complex; /* some complex computations to produce the 'complex' value */ trace_qemu_vmalloc(size, ptr, complex); @@ -364,10 +366,6 @@ guard such computations and avoid its compilation when= the event is disabled: return ptr; } =20 -You can check both if the event has been disabled and is dynamically enabl= ed at -the same time using the 'trace_event_get_state_backends' routine (see head= er -"trace/control.h" for more information). - =3D=3D=3D "tcg" =3D=3D=3D =20 Guest code generated by TCG can be traced by defining an event with the "t= cg" --=20 2.20.1 From nobody Mon May 6 15:22:31 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579533224; cv=none; d=zohomail.com; s=zohoarc; b=DUnpfHbK9vYqkmbv79yH30tt9824fi+cmCZKR6Qqp1IMa4rmB9sqUxmw/4mdBR9rxrJ0pPeAb3QtlBDPCl6X6IU392IYlP/HGiuNG1qUfUzCQ7fehHhShHMhPJ+ZWobQzwXvidLnE7vs+m/CkZUbrzBch2SXZkVUVh+KpmLP/MY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579533224; 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=lFQzfIG2mcQ6kNeefaXxZhlvNs2iYmZJDouckBmIIpc=; b=ajaRBwzr2t2S5rGyjstpu62FtRYaXBMaekclWE9veHyklAWO/XsAgah9wX8Eu9Uk5yXhieYDbi5Q0T3RQ50sZDFt9miUfaAuFOdWMaWNLazVnzpbHPbdhiNS7RYjUCrcslcTq0mJrHPvo97/McXdqqABLYvwQerQ+VonzEAbqSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579533224002703.415432541691; Mon, 20 Jan 2020 07:13:44 -0800 (PST) Received: from localhost ([::1]:38432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itYkI-00020P-CU for importer@patchew.org; Mon, 20 Jan 2020 10:13:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47485) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itYiV-0000EV-6G for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itYiS-0008LS-U3 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:50 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:56290) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itYiS-0008Ku-Nh for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:48 -0500 Received: by mail-wm1-x341.google.com with SMTP id q9so14836617wmj.5 for ; Mon, 20 Jan 2020 07:11:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm817919wmc.8.2020.01.20.07.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 07:11:46 -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=lFQzfIG2mcQ6kNeefaXxZhlvNs2iYmZJDouckBmIIpc=; b=vqNimJ0At+FFrlAxtDqqIOsPP3vVEClKiIK40Jh+f6gAl5NDmVGqOvgN+qJm2ahCJ8 ywVW9YkfFdjCQ21/N7xCHxMWZfH4W62xDXNm9u2mdacnSkEisxZl+ucdFLwrfQYVEd7J wTRJPVTgKZDhi5xk8NgTdVkwjOXk26XNtcfXZtvvhQHE2VZWRsnjQ6mH/kvgSQmo5OQ/ UsExVjcKUISYtKFlxLJpTOBYwiV7FP614X41DhWQ5/f4II87EV8kA6twFNHEKmEF/eMw ABZF6FMBUt2oFCPG+5f4g8oFXah12HgpvjTtm3ap4fcAS3f6phcdRD1L0Ega1dYVXNKG D9pQ== 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=lFQzfIG2mcQ6kNeefaXxZhlvNs2iYmZJDouckBmIIpc=; b=LyikOUtC6O4IRXOvwphWf3lstQ5MjfSEE5/TZ57QZlvPK0OTZaAVTPeA6/I1nGlzHx +jCr4YrVAIFntsmY4pZBMzWYePdk7I/KqGwzEAaD2sRlFedQabBilEMaNJ3TbK7FfHiz ry/1skpxVs7nDKVrQ0D/zHl8BS5kKRv9NWmKbyZYUlf6Q76kLxTDctMnIpAGTyUrDpcQ ECE620H90SWeKlNDROawEbaeXuExB2XIkWHAMUOtMFSftU3WgjReazTFPW7P/tvaN5YV 4PnmABqf3UdSKROo4j8YHxm8Uh7qqJzHJQuAfvJ6PXeAuZuqd5kvntPPCtQiObZyyAgi B73A== X-Gm-Message-State: APjAAAV+IMa3+EE5EbuCFBBhBr7x0JE/phK4osFSB2hNgEatTdMH0FEx 3vdslm/ThykowLNlnTy5H9iXpak0za9VDA== X-Google-Smtp-Source: APXvYqwJLCNFlH9TcBMEgbH1cVAa0YxainPc5CrQuDd7NwiWU2NzgfNcesUORoZpdqRAKfIsaWTB/w== X-Received: by 2002:a05:600c:251:: with SMTP id 17mr19314860wmj.88.1579533107363; Mon, 20 Jan 2020 07:11:47 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/3] memory.c: Use trace_event_get_state_backends() Date: Mon, 20 Jan 2020 15:11:41 +0000 Message-Id: <20200120151142.18954-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200120151142.18954-1-peter.maydell@linaro.org> References: <20200120151142.18954-1-peter.maydell@linaro.org> MIME-Version: 1.0 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::341 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: Paolo Bonzini , Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The preferred way to test whether a trace event is enabled is to use trace_event_get_state_backends(), because this will give the correct answer (allowing expensive computations to be skipped) whether the trace event is compile-time or run-time disabled. Convert the four old-style direct uses of TRACE_FOO_ENABLED in memory.c. Signed-off-by: Peter Maydell --- memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/memory.c b/memory.c index d7b9bb6951f..0baafe1fa90 100644 --- a/memory.c +++ b/memory.c @@ -434,7 +434,7 @@ static MemTxResult memory_region_read_accessor(MemoryR= egion *mr, tmp =3D mr->ops->read(mr->opaque, addr, size); if (mr->subpage) { trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, s= ize); - } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) { + } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_READ= )) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize); } @@ -456,7 +456,7 @@ static MemTxResult memory_region_read_with_attrs_access= or(MemoryRegion *mr, r =3D mr->ops->read_with_attrs(mr->opaque, addr, &tmp, size, attrs); if (mr->subpage) { trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, s= ize); - } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) { + } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_READ= )) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize); } @@ -476,7 +476,7 @@ static MemTxResult memory_region_write_accessor(MemoryR= egion *mr, =20 if (mr->subpage) { trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, = size); - } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) { + } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_WRIT= E)) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, = size); } @@ -496,7 +496,7 @@ static MemTxResult memory_region_write_with_attrs_acces= sor(MemoryRegion *mr, =20 if (mr->subpage) { trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, = size); - } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) { + } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_WRIT= E)) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, = size); } --=20 2.20.1 From nobody Mon May 6 15:22:31 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579533222; cv=none; d=zohomail.com; s=zohoarc; b=Ahgt+qPsKxEZbXTMxTFM8nym01HysXQAsxvJ9Y1zw1q4VGYnD7RNpPaW08mrfepRvn7Oedt6ozqrkQFOWDTU7+o1TNGpUqTI7FQxgMT9T69dCcH7ojwSFbmX2wgQvwYSFFqRWHtiIBTvioY6GV+1zwtp7r2Dtoh25kdOdW3gCTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579533222; 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=kyP6q/PhV5q+RaHRDmSj+IKiauIeyDHvRutDmqUe9TM=; b=KcFYH/DFrE8v1PP+1C+oLjucT8saA9cm5sr7AMF6I/QHal72r2oGAA1XCHi1G/yD34J14BG5Z4HU8XjfmKGGX0y0LfWhgIV+8IUp/gVGhwOb3mwJULJxVSRAjmqCpjfvOH9QfrcFAxnjA9iCv+ROK7hzTCtC7Pdo2nUghKWc0EY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579533222572858.1786058814728; Mon, 20 Jan 2020 07:13:42 -0800 (PST) Received: from localhost ([::1]:38424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itYkG-0001vW-1L for importer@patchew.org; Mon, 20 Jan 2020 10:13:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47491) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itYiV-0000EY-AL for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itYiU-0008M1-04 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:51 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:38121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itYiT-0008Lg-Qf for qemu-devel@nongnu.org; Mon, 20 Jan 2020 10:11:49 -0500 Received: by mail-wm1-x341.google.com with SMTP id u2so15064606wmc.3 for ; Mon, 20 Jan 2020 07:11:49 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f17sm817919wmc.8.2020.01.20.07.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 07:11:47 -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=kyP6q/PhV5q+RaHRDmSj+IKiauIeyDHvRutDmqUe9TM=; b=gmFWvdMVHZdDdkLnWlhAd6LBFtHjJ/H4BfnvWeviQe6SELJfIDInXNrzWP/zhQD0jl Dyqvt6vrFSSSj7aE8MLfZnScGF3lFqpWLuUO1lJ6U/KN0zVpepR3tc2bILRUfpNdH1h2 o31ZZap1E19pHzPFLgaPVIZZn33LytsE+WjOFTCgBqppJj67/4qgwYfC9UIwxNjAKLI+ EYefjjYyqsSILgC5TTl88DkGY78Cz1hiIdEAA5ZGL91CmSqfN4b0NpEvqSfs8GMuVjxE YHlO0VHkHCTYq2lpgcdPaVsKZu0T6cNug9V3OzLLlKF9KFiTt5CkIl6y971a/gY4FeSC jNRA== 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=kyP6q/PhV5q+RaHRDmSj+IKiauIeyDHvRutDmqUe9TM=; b=mksCwcXMVZQPyAOe1uR69+9AkDSRLRLITQw+GRFIsmszYO/67Qg8YPGjiCzElZtpke Eoci9Pk+bHeaiA/TTb14+sJEnUAHOmCWHxm4zNv/c+CDYvj7094aTpBdp4eINzUCGArN 4yLaCVrOi2eOotT2V0J04egEPuOEiMeakeihYjyGs0wwNZcU2yA5Ux+ban98ORr3vFCV C3ncuPzUxUANb9k1a4i4hADCFMxtpm3cA5brxWbe/FymqLf+3smgH0QJ7ldOOBpBTQ2B ZjbkBAlVNJfD9erKQREKbpk6zJUPY4+CKSXACN+nbl6l1zqPGjovULiokLaVUAP0pduA +tCQ== X-Gm-Message-State: APjAAAX5+ccuLLP9Bf2t2XS4N3dbEU23cykOuL+vIzdA8maUfsCJmhhH AkMCsQvYjmqkme/WFyExVk1SvoxXrkJiQw== X-Google-Smtp-Source: APXvYqyc80UUcu6KJhT1DViU45TyXQ/wVJ4FpXqlR8NsLjJUxtTzatzrz9EFpMW0aj+uH5c9IhYHCg== X-Received: by 2002:a05:600c:21ce:: with SMTP id x14mr19142404wmj.120.1579533108520; Mon, 20 Jan 2020 07:11:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 3/3] hw/display/qxl.c: Use trace_event_get_state_backends() Date: Mon, 20 Jan 2020 15:11:42 +0000 Message-Id: <20200120151142.18954-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200120151142.18954-1-peter.maydell@linaro.org> References: <20200120151142.18954-1-peter.maydell@linaro.org> MIME-Version: 1.0 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::341 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: Paolo Bonzini , Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The preferred way to test whether a trace event is enabled is to use trace_event_get_state_backends(), because this will give the correct answer (allowing expensive computations to be skipped) whether the trace event is compile-time or run-time disabled. Convert the old-style direct use of TRACE_FOO_ENABLED. Signed-off-by: Peter Maydell Acked-by: Gerd Hoffmann --- hw/display/qxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 6d43b7433cf..80a4dcc40e4 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1764,7 +1764,7 @@ async_common: qxl_set_mode(d, val, 0); break; case QXL_IO_LOG: - if (TRACE_QXL_IO_LOG_ENABLED || d->guestdebug) { + if (trace_event_get_state_backends(TRACE_QXL_IO_LOG) || d->guestde= bug) { /* We cannot trust the guest to NUL terminate d->ram->log_buf = */ char *log_buf =3D g_strndup((const char *)d->ram->log_buf, sizeof(d->ram->log_buf)); --=20 2.20.1