From patchwork Fri Nov 8 16:29:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 841755 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp1733379wru; Fri, 8 Nov 2024 08:30:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUyHDOeFWMaOJPb+AbAI1zapoJm68xb89qWneVQhhEVEmJCnK2iw39i6rWamXoAE4Qz71E/jA==@linaro.org X-Google-Smtp-Source: AGHT+IFsfkc4GwTxVtRAqG8NMhlpLUu26YGcgH+DbOuQRWDwo8lyEaKG8fOUSk18m6EJcQYo7U/9 X-Received: by 2002:a05:620a:2614:b0:7b1:19f4:c6e0 with SMTP id af79cd13be357-7b331f195dbmr368265585a.51.1731083411053; Fri, 08 Nov 2024 08:30:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731083411; cv=none; d=google.com; s=arc-20240605; b=ZiHTxEkKbzMnq84myePNozT3E9YcpZ6ZAluMyXA2BnEuIV5E9JzW8vtjvgEJF3NFml k1gkEQIs4slXRZkzDyFjggnX5wSrvnQlawbN2tJzUjBAJLoQHq0Ylyg0oTFNz1/fu8TE 6ARjCqPnu/nFTAApX5vYHtVwvwluf8hdkq0KCnQTH6U9OSIJokQXgYZY/qKMU1gWqPuq wZlRs+Qkj1BQDUP42IJnHEzaxkMb8l9eiOpqiOs+mhzDh40o/xS/B7/8Wlyl70hqZDqh KgNseQ5/Vz+ke3YWEJCQnnuHl1iahycVWzhH9T80dddkokkyO99HmiplhlmA8vGd8w63 T01w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=j7j975pXlGw+vVjq9yeZZzQunJjncVGsi/tk3WFhJXY=; fh=4MA0+uhl5nykcBNZrMXRQVt4xEE54qMPD/CW+H0QEWI=; b=J+P3FtNrGHBSY0MQtC8NsV/+TuBvvYY94SVvkC3DskJ0vxQLDa1xJhY4RxVYuSIU8T 1rogqHSUooneRRCh6SXwRRwih3gFnRai7BDLGnVgoqnOKl9dJmp7HpfnjPxpDixWwcFX 08TCuhSdkYqN6H4jP9nBs5otZwJr1Spw6EeoLwYkERb+vD1gvtUpz5NVLKiw1uZQLcJC PMGE+425ARCmBhSVCgMfiGy8uzjweif2oPvNoBhxL/swiGFpucXEQa0u8HanvYm+PcY6 SO26p39Nc37lPd/tR0tAGOGG4X7Z387QlvqcOrALRDUIp2Oz3heHrJ3jQSlFVbjGKs8c 0+Iw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IdKhdxdg; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b32ac3da05si437608585a.90.2024.11.08.08.30.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Nov 2024 08:30:11 -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=pass header.i=@linaro.org header.s=google header.b=IdKhdxdg; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9Rrd-0008WE-QF; Fri, 08 Nov 2024 11:29:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9RrJ-0008U0-5k for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:22 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t9RrG-0003qc-A3 for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:16 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43155abaf0bso21274245e9.0 for ; Fri, 08 Nov 2024 08:29:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1731083351; x=1731688151; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j7j975pXlGw+vVjq9yeZZzQunJjncVGsi/tk3WFhJXY=; b=IdKhdxdgtjSQtPMLve5FJI4Wc8ai1B/GbGz2XR6xg1lGOFcbxlv5uja3gYn43t1Rj4 kb+H9alZrmcDwuG0qeqPE1LJsbhiJg1Ml5Azp9uSNDNxS1sdplpGkSegNUiqFZRUvu8c CK3Jm6ZrAWxAA44cN2BBsiyCyVXk8iy1MJo49o2qIQwTh5heXfxdkx3NLS09HehmzOZ5 zxAxxKZDzZC3g513jk61E77/fh5uLpl1qBZjhgMZsvCu2mDBXT/XsXCtSttba76z/a8z OIKdXJaYwuUI14dNhuxLIRtjRjGuP9YXh1NylVcl4PkP/SVLAPGzoeQaOsDOLcvu7nK/ EnOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731083351; x=1731688151; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j7j975pXlGw+vVjq9yeZZzQunJjncVGsi/tk3WFhJXY=; b=I6aMqpy+hjIX5tZyNrsWGWGcz/pHFVSQXnRFwBKZmf+KuInfGZ/sfZqmm2+y2nDctn kDI/AETC51rlXYjRG5spP/sevKucG6az5nsXCrYDf1dqRgCRZl0AbBFgkauWWq1SRrYO 9R3bBrHxj5mlsexePwGjkYBWPybOsoxeu7/lnrDl7qLp27mKuzPEwtDBDmsLBoD9goJH ZwPHRonrtsjpmpEw/jNsTHGofmkGu3t7bIXmHJ/Kbz5hdjCshKh5POWRP3/yq7If+lTg IitfudcCCyPZHR6PfVHX0H+XXKul6jN645KI2r5nYQ9DKoUFzuyj62OZ1P1qyA6GXSL+ 9OeQ== X-Gm-Message-State: AOJu0YyD3GuFXlGPQZ5TFh3vQ7lwtL61kA1pN0AVV51i0vm1smC7qStI QRSz0eNuZ2VT70wirHSMk8T1JndaGLksWMAUk8p33hBIyeCW3BadbYKiIJdFY73k+OTphdDRR7j p X-Received: by 2002:a05:6000:1ac9:b0:37d:461d:b1ea with SMTP id ffacd0b85a97d-381f1885defmr3087250f8f.48.1731083351073; Fri, 08 Nov 2024 08:29:11 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432b0530599sm78109135e9.1.2024.11.08.08.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 08:29:10 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal Subject: [PATCH 0/3] trace: Minor cleanups to trace header includes Date: Fri, 8 Nov 2024 16:29:06 +0000 Message-Id: <20241108162909.4080314-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This series does some minor cleanups which deal with cases where some C file is including a "trace/trace-.h" file directly. Our documentation in docs/devel/tracing.rst says that that should generally not be done; instead there is a trace.h file which indirects to the generated trace-.h header. The only exception is that source files in the root directory include trace/trace-root.h. The three exceptions fixed here are: * system/dma-helpers.c defined its trace events in the root trace-events file, not the system/trace-events file * we forgot to create the indirection trace.h for target/arm/hvf * a couple of source files in trace/ include trace-root.h when they don't use anything defined in it thanks -- PMM Peter Maydell (3): system/dma-helpers.c: Move trace events to system/trace-events target/arm/hvf: Add trace.h header trace: Don't include trace-root.h in control.c or control-target.c target/arm/hvf/trace.h | 1 + system/dma-helpers.c | 2 +- target/arm/hvf/hvf.c | 2 +- trace/control-target.c | 1 - trace/control.c | 1 - system/trace-events | 7 +++++++ trace-events | 7 ------- 7 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 target/arm/hvf/trace.h Reviewed-by: Richard Henderson