From patchwork Fri Nov 8 16:29:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 841757 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp1733404wru; Fri, 8 Nov 2024 08:30:13 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWDPberGC2v9IwzrVGoMrG+h1jv3SHadDknRaKKdv9OgqprfTlv9lBJreXNHymJrT5daBatiQ==@linaro.org X-Google-Smtp-Source: AGHT+IFKH5kzPCEmZLYJ0aR2UyiNj0SaWynYG17+RzFeX7abYConH+wMxM9/kbGIRswMe2po8+MT X-Received: by 2002:a05:622a:22a8:b0:461:17e6:27aa with SMTP id d75a77b69052e-4630932a187mr50202341cf.15.1731083413477; Fri, 08 Nov 2024 08:30:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731083413; cv=none; d=google.com; s=arc-20240605; b=hzKMyjKhfmG11r2QZZRcZmzAqa8Sfp8tdqwmnMrSm7NNfL8Bf+G8Oga5XD1/6Jhb+2 sxy0SUWZzp/hdRVhbCxYwQDEXrki+IETdY2f5q9Og6zul+ZImmdZ9gPHHaGWiTrC19c3 Yw2hxNdB6mkw4tN88ZoQZ0Bzl0ljSnZt9juSc9GbORQOKYZGkftXELVCMt5DmXy1crvm Ff54JWFZORiJh1bZZmg+QgkT4QnOLuNtZ9kSM7A23OnGcgW7Yy9nLAvab5ErJCptV421 82S9hGvSpUxEFG1kMMK6C02feCDTAdF6+oP9Aa0sFVrqZrmOUZcPhL6Wdsda0qAtDZED xDaQ== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IopW0NUe1TNdNcszGjYz9ml/HiprL+NUDAeJGglZdAY=; fh=4MA0+uhl5nykcBNZrMXRQVt4xEE54qMPD/CW+H0QEWI=; b=CWX6Do9yLJT5WtCHoEtwgc4vYhNSBKSk14PjCfJUCjmPzU4LKa+P7UkWngZtMjjzfi SBr0ZWCtWOe8UrwC7wBfE88hLpQjtPFmIDtpjQqmABj82f0+BalGLaXDqwzfCKQQRswe kETm9XxfmQ+TohfuU+pzSjP4vuOwFG0uL4w8XTIRKJgHyxJlDnCEIgeFxrBfXV4iQtol FJwkJ7Egc6f2A5ovgEFAeHemJxE+C1EvORcDAC/qGcKd7CF08LaDBuXt2dZoOxY4tkKr rt2XGNH+J9nLlWFdtl/A1jxDg2Ft46UHW7TbVbut7sR/A2UHTzrVqkHbtgu06QyC15c6 L2jQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cPtNcb6h; 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 d75a77b69052e-462ff61b166si45830571cf.410.2024.11.08.08.30.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Nov 2024 08:30:13 -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=cPtNcb6h; 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 1t9Rre-00005M-A8; Fri, 08 Nov 2024 11:29:38 -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 1t9RrP-0008UI-VZ for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:24 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t9RrH-0003qm-0c for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:18 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-431ac30d379so19781705e9.1 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=1731083352; x=1731688152; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IopW0NUe1TNdNcszGjYz9ml/HiprL+NUDAeJGglZdAY=; b=cPtNcb6hiLRgbzXGmjdMT3MbUAYMsf9ojgZvScpFZ0ust2u/S5Y9hLHfcGojZwRmSr Or2uhX+YZiJPRght8KV4jEXsy2c19nqiAz2H5VaaW06rcHEX9t450BrHjxgzsl32o35B G8OATadpRP/gutFkP7oq8nDzKHuY4kXu6G/oILutZYIX/qzNgGUI4HgWrPbVJPbqHjRg BJimX3sMdfh/5UawtkXr57/kr5poQt001yq3XF0akblTHxgQjnv8U8A1jLcigqLbYIMU 9kQZ0EwHpIhmHi4/r90yhaeztd9G82BWQ/11pI1jgcug/k2QIAWy55u/oBi6Kfxk53db 3epQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731083352; x=1731688152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IopW0NUe1TNdNcszGjYz9ml/HiprL+NUDAeJGglZdAY=; b=N4HCK+YO10eREf6q9yA7B7NazDs4GbALC3h2AVv77ZE6H68IXEMJ+/jsZgRu1vurjZ 2cOeIF1VH6wZhLn+rVTtheUnMYhAOD3EpWlvr9vtKqEFWjhfK7uj1pcOuMAuy55ApSLB 6BGhgy2ahpf4cuV8d7EXDdwZ4kHFJU5OjwIckWkDCQ7IHPJ9LkicucYQCAmc6+vbjD4M n8tBv0B6+EI+G0+wKMEYpIlJGIWv2ihVA5vT+kqN9dH3ppdcvBRxZKDQ+KJYuiFAu7HD F76bmEmPRNnfWEgZYsfaQyolJ1uNB5gFDVHvb30lAFzLFhe/sPR6FJgLEhCeYWqPPFOh RWpg== X-Gm-Message-State: AOJu0YxDCywiS19GnYWVjgkJpsRD2USugYR8cwPBDiVd00d7YqS+f3o6 6Ilt6VwWDg23PlH6P/lxHWynK8Ss4faG4eyETc0x32UuGJ3amqQ4ZC2PT2RdgOZz2vP0BibY2E4 B X-Received: by 2002:a05:600c:1391:b0:42c:b905:2bf9 with SMTP id 5b1f17b1804b1-432b7506634mr29347145e9.16.1731083351673; 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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 08:29:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal Subject: [PATCH 1/3] system/dma-helpers.c: Move trace events to system/trace-events Date: Fri, 8 Nov 2024 16:29:07 +0000 Message-Id: <20241108162909.4080314-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108162909.4080314-1-peter.maydell@linaro.org> References: <20241108162909.4080314-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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 The dma-helpers.c file is in the system/ subdirectory, but it defines its trace events in the root trace-events file. Move them to the system/trace-events file where they more naturally belong. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- system/dma-helpers.c | 2 +- system/trace-events | 7 +++++++ trace-events | 7 ------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/system/dma-helpers.c b/system/dma-helpers.c index 74013308f52..cbcd89dfaaa 100644 --- a/system/dma-helpers.c +++ b/system/dma-helpers.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include "trace/trace-root.h" +#include "trace.h" #include "qemu/thread.h" #include "qemu/main-loop.h" #include "sysemu/cpu-timers.h" diff --git a/system/trace-events b/system/trace-events index 2ed1d59b1fb..5bbc3fbffac 100644 --- a/system/trace-events +++ b/system/trace-events @@ -4,6 +4,13 @@ # Since requests are raised via monitor, not many tracepoints are needed. balloon_event(void *opaque, unsigned long addr) "opaque %p addr %lu" +# dma-helpers.c +dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=%p bs=%p offset=%" PRId64 " to_dev=%d" +dma_aio_cancel(void *dbs) "dbs=%p" +dma_complete(void *dbs, int ret, void *cb) "dbs=%p ret=%d cb=%p" +dma_blk_cb(void *dbs, int ret) "dbs=%p ret=%d" +dma_map_wait(void *dbs) "dbs=%p" + # ioport.c cpu_in(unsigned int addr, char size, unsigned int val) "addr 0x%x(%c) value %u" cpu_out(unsigned int addr, char size, unsigned int val) "addr 0x%x(%c) value %u" diff --git a/trace-events b/trace-events index 9cb96f64c4a..3ec8a6c7202 100644 --- a/trace-events +++ b/trace-events @@ -30,13 +30,6 @@ breakpoint_insert(int cpu_index, uint64_t pc, int flags) "cpu=%d pc=0x%" PRIx64 breakpoint_remove(int cpu_index, uint64_t pc, int flags) "cpu=%d pc=0x%" PRIx64 " flags=0x%x" breakpoint_singlestep(int cpu_index, int enabled) "cpu=%d enable=%d" -# dma-helpers.c -dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=%p bs=%p offset=%" PRId64 " to_dev=%d" -dma_aio_cancel(void *dbs) "dbs=%p" -dma_complete(void *dbs, int ret, void *cb) "dbs=%p ret=%d cb=%p" -dma_blk_cb(void *dbs, int ret) "dbs=%p ret=%d" -dma_map_wait(void *dbs) "dbs=%p" - # job.c job_state_transition(void *job, int ret, const char *legal, const char *s0, const char *s1) "job %p (ret: %d) attempting %s transition (%s-->%s)" job_apply_verb(void *job, const char *state, const char *verb, const char *legal) "job %p in state %s; applying verb %s (%s)" From patchwork Fri Nov 8 16:29:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 841754 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp1733369wru; Fri, 8 Nov 2024 08:30:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVd3ePJNIrRNqBzJRIB6eHxwCWIB5ZZYqB/UIn9ZNr8kGaMke334Nm836jlMMNj1AklNca+jQ==@linaro.org X-Google-Smtp-Source: AGHT+IERuHGfYHi5TUQK81lFspCJp2WOtk1kZt3+hi/DcODvgtHMiQU5qXvvP/aR+mzjk6MYHd2d X-Received: by 2002:a05:6214:3bc7:b0:6d3:65ad:5cf9 with SMTP id 6a1803df08f44-6d39e1263d8mr44014026d6.15.1731083410270; Fri, 08 Nov 2024 08:30:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731083410; cv=none; d=google.com; s=arc-20240605; b=CP2m6QnktdfS+dFWEC34f1OODfOG82D5Tw1hw9pWoi6v7A53vszjJ1CbdEmSIMJk4k Klk8XtuY3+MYlLoclVYfVL6JKZYp7UfhjUWVndAtfz1L8yQX54N6HVNrTJKmfj23lDqf bicsyHzhPkFGCVtF6UTWmwiiFjkKnZkELynkqYELWNqFA43x7uz4WBGkLcHMQRTK47w1 6mMleR8ogyfblmrQGbX0L/tlkTROfsy9p4njZKDKgHWWJcZJF/5QYcEiNqDPXDcUGHqk iTkO/xiW9uT47QhXKNwkgCqw4+K8kH19n6rQGSpQ0GNEPQ/IoUzVLFl3JQKXq9X0gIgv SvwA== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fLs4TQ7UF2UTNWreJQ08zWy7UHceQfrRSeNXZ5kQan4=; fh=4MA0+uhl5nykcBNZrMXRQVt4xEE54qMPD/CW+H0QEWI=; b=LtHI65gEABvq9lv6md+NrsbaLa1vZjoUSiDub8wJvjfFxJsMu9RtOvWbfBqOV6BJvg hfrgHnQcYOi36jt2BsQVt2oZmvruycn+Pq2q4iE4qMaz6MCmc40GcjuY4PmIbjwOOboZ HLEsmpqX+PCiIZozQmFRqbgo3R8ejzhQrt750OEz4sMV/Zd77OMyzw3nO6WCPoh0rkvM rNuJ1apOIQ90Zls8/9TsT4tZdC8Xg8Y+zML5b4jaK1GmWW30/MpsD6VXfAU3e3brtgbK NcB6LI3nFyVzvjFuR9Dk5XcjV0CoV/m7+5lAg+abvOUCoLnz4Op2kvDb3vHGF1Zsco26 FqPw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uUpAxab6; 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 6a1803df08f44-6d3966c1176si49222636d6.545.2024.11.08.08.30.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Nov 2024 08:30:10 -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=uUpAxab6; 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 1t9RrW-0008Uv-45; Fri, 08 Nov 2024 11:29:33 -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-0008Tz-5Y for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:18 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t9RrG-0003r1-Vm for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:16 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4315e9e9642so19685685e9.0 for ; Fri, 08 Nov 2024 08:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1731083352; x=1731688152; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fLs4TQ7UF2UTNWreJQ08zWy7UHceQfrRSeNXZ5kQan4=; b=uUpAxab6yxD8hZ0SFK6IY9H/FCcGSSHDgynBJM5YUH9j+SfJVL+6+3rQADqRlDCruN eIIX+cWzjqYlyeaP8E8noqrXxLWa8nsBkQI3UN4Y4gp7Gw1IRQfLSLvFy1CHJvtCoOL0 D+lTt8bV/PysicNJyyh3Nm+hduJCRxd+sduUGnZgtlX1yaCBdwpdotyZxBDubHs3KLka Asol0BRCkXaHKtcINhdHZbGnwxO7wLeLJ6Y1WbeHvR/FswFu2Rsav9FAirMqz26/HWTB ki2TjS9BV3/o97ppQLUktlpP0q9MERtLzgwwLbfwzzvsfvpYQ4cciI+4VEZTUhbUxG/I rofA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731083352; x=1731688152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fLs4TQ7UF2UTNWreJQ08zWy7UHceQfrRSeNXZ5kQan4=; b=GhSEQqnHWLlC8lIaYh95Cio41NStUSwMj6MfX/2Mfd4bc4yASDke8yfG+6DJMflgPF Q4hWPHuqXz10QPyfJWirwuJaCSB8HE9vzB1k4Q65+EEaaymuP6rUzAFEj6Dair3p+DGQ ny+MSqj2LRGHiOa5volDTWLaXyJzWdIozoOq9/ffEqgU0LjuuKt9orNgg9qcflm3k4pP X016dex25fimU6SHwD+J9CC+RIfTtAPpNigmQmGgHFUgWwf+RmLUVRtU8JzxwlH2C0ki JYgQ/FjvNCPpOB+wlQXmR3iYaD8ScVZwj6yKHOSS0ORWiAE8gLS0kzn1K1d+vux0SlxF CgRg== X-Gm-Message-State: AOJu0Yyl+jOWo5DQjid/g7mlovib4R4XkzaMLVSjqatYY19AX8DAua7V QGvcLGM7KvNwgWg6UxBXyigkiDg/oFQppPyvEUzb27cSKwNdF2y3MmuEOBM75g1DKkPAYPpVwf1 I X-Received: by 2002:a05:600c:1d20:b0:431:6060:8b16 with SMTP id 5b1f17b1804b1-432b751ceb4mr27698425e9.30.1731083352217; Fri, 08 Nov 2024 08:29:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 08:29:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal Subject: [PATCH 2/3] target/arm/hvf: Add trace.h header Date: Fri, 8 Nov 2024 16:29:08 +0000 Message-Id: <20241108162909.4080314-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108162909.4080314-1-peter.maydell@linaro.org> References: <20241108162909.4080314-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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 The documentation for trace events says that every subdirectory which has trace events should have a trace.h header, whose only content is an include of the trace/trace-.h file. When we added the trace events in target/arm/hvf/ we forgot to create this file and instead hvf.c directly includes trace/trace-target_arm_hvf.h. Create the standard trace.h file to bring this into line with the convention. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- target/arm/hvf/trace.h | 1 + target/arm/hvf/hvf.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 target/arm/hvf/trace.h diff --git a/target/arm/hvf/trace.h b/target/arm/hvf/trace.h new file mode 100644 index 00000000000..04a19c1d752 --- /dev/null +++ b/target/arm/hvf/trace.h @@ -0,0 +1 @@ +#include "trace/trace-target_arm_hvf.h" diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 6cea483d422..ca7ea92774a 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -31,7 +31,7 @@ #include "target/arm/internals.h" #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" -#include "trace/trace-target_arm_hvf.h" +#include "trace.h" #include "migration/vmstate.h" #include "gdbstub/enums.h" From patchwork Fri Nov 8 16:29:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 841756 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp1733386wru; Fri, 8 Nov 2024 08:30:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXfjX+q8QIp4WCZB3ddi+hbluHVdwJqWTWR6CVlgRVO5z6xLukLRs1YYbW5okQ3KH0JUcD1pg==@linaro.org X-Google-Smtp-Source: AGHT+IHFhlTIl/qxEIGirI0QkshiVPYNe1E9nkvt/zTVivvYr9U9ZWslnB8NxuvomLK7bzZMKiOD X-Received: by 2002:ac8:5845:0:b0:461:40f3:6e7d with SMTP id d75a77b69052e-4630943119bmr32604241cf.55.1731083411753; 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=MBaHZ3GMLhJd3aFE5DgD/5h+3wL0v0myN/N0gRjAQIyR7LaIzvsYQKOtvfS1l5x5Nn vEO/m6u+tVq+VzirwnOrrfvfY22Q2+PT7N8ggPntMh2fL5KK4WlJGgyaAxTEOvl+uWtG AtP51zje8FhKROWtJJktPw6KU3QeoSaIiDRXkSn0LpcyMWOpvKioF2Gaz1m+BHV+oZKT 6VOA3Ih7GoEtt5yxvlJKNkzMyiWsRJ6etFRtr4VRW4OIFTa+ECa1lKTW1IosVS2PErRR nAOKix8ScbC5TpN8Zj26evGzvVSU/ZubEZ2kmkRG9c80nL1ZtpRLAnL1HCXrrLG6KYEN OmnQ== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TXACTNjW7XQDDQR5ql26mWd2hLljWGI/IOPLLCh6Itc=; fh=4MA0+uhl5nykcBNZrMXRQVt4xEE54qMPD/CW+H0QEWI=; b=DsCAWA3seyoyHGPAT/lKTR91Lgy7GS2VhoURh+gHhwPlU/8cJiKYWmWZcZHHjPg7/e hPv9oUy8sl5eVKbO+cq6EvhUspuPKhGDg8trwp1vlKgYMmkv2lulTv8e6p8ZDspyIyEj DmBJz8zWS/eSQC8WiG92qJ96iGNjfKNIlEajoiKJk21EhwnG1yiEu1pRK+ZT/CaBrYHg 3etf5U2QPRRmyt931JyRBSpwL1QdbUHiJy0Ep3+nMxz9k5RXQp4fbeL/CUPgH76PiejL DrCVBhTogMumI3GWaKKWIY/UlAuAjaT1YfFJs11PTrmM1kvdwn65NL4hP9wIVFni2JDt i/mw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mn8AZG7X; 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 d75a77b69052e-462ff618b0asi44550141cf.368.2024.11.08.08.30.11 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=mn8AZG7X; 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 1t9Rrc-0008Vx-G3; Fri, 08 Nov 2024 11:29:36 -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 1t9RrP-0008UH-Va for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:24 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t9RrG-0003rI-W4 for qemu-devel@nongnu.org; Fri, 08 Nov 2024 11:29:17 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4315baec69eso21060545e9.2 for ; Fri, 08 Nov 2024 08:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1731083353; x=1731688153; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TXACTNjW7XQDDQR5ql26mWd2hLljWGI/IOPLLCh6Itc=; b=mn8AZG7XUiSSj4cuE2KzxLf2ESUpsC3E0YnVxELYevxX/wZFPSeb3C0Ht5YkKj1iB0 vvTOTIkvNqaE9nhruIbWMIZyOTM6i6BnsoSAhubPxENPKos62HhSB5SSqr40txOZdgb6 oETKQ82khSWAz8mK6wdzfUf1tENRp2gm1UO69OWnt/6ln1lmyUb4IZA5epL9LElRegFh Z2wMBBwFpSaT/2appLQFvkNLsOgF2mXOcy0x9diTg0IFuw/SHqb3r4KgRnB9phxgbCxz 3a911xK/DwofiD74vkL+qk7RU/ibcwVvad9dNNa78vQn4ft4blbPz07lsc0XWgkZ4ugw KRGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731083353; x=1731688153; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TXACTNjW7XQDDQR5ql26mWd2hLljWGI/IOPLLCh6Itc=; b=O9/4fu8HAyt1pXN3nVhWm/yzFp71zJ3dnk1YiLKuTrFDAmlQXK/Tv2WOS8nvdRkBRr fUqSXrk09XqZ/FDlX5ALbYXP2/ItaF4wGTTm92eNk8cSagfCJP7SmYQD/T/bKljwwK2O puyWnh5RBQW4ymlrmIGOkC+CHOqERMd3BNaLQR2t3mL8/755cFf5CzaQhsfDxyUzgF7i 08cYUwJqu3oV/2yXW4sgtzNIgLYoQf+HvzThCyIYol5MzGu4mzj7IKTAMrIr0ECPRDZ/ xxYLYevwQLSVi2MQOEFDdtdpmjeTfpV0/gl3AsJmkM7CG4wlKFRytyumR58Pij+5QvzO JhGQ== X-Gm-Message-State: AOJu0YxpP1KPvumxBRUQCX5XaaYb1RGl5wtzBrtEz/NkrqTHnvSYC/gi FnT2KS9PmbtB+orIvG3V2YmJQjx2d18KkEXJ0AFOuU+7NrArQTnvviprt26MQAmhafWA36Afehe l X-Received: by 2002:a5d:5f54:0:b0:37d:4cd5:ffec with SMTP id ffacd0b85a97d-381f18632f7mr2919213f8f.2.1731083352960; Fri, 08 Nov 2024 08:29:12 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 08:29:12 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal Subject: [PATCH 3/3] trace: Don't include trace-root.h in control.c or control-target.c Date: Fri, 8 Nov 2024 16:29:09 +0000 Message-Id: <20241108162909.4080314-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108162909.4080314-1-peter.maydell@linaro.org> References: <20241108162909.4080314-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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 The trace-root.h file has the definitions of trace events for the top-level trace-events file (i.e. for those events which are used in source files in the root of the source tree). There's no particular need for trace/control.c or trace/control-target.c to include this. Signed-off-by: Peter Maydell --- trace/control-target.c | 1 - trace/control.c | 1 - 2 files changed, 2 deletions(-) diff --git a/trace/control-target.c b/trace/control-target.c index 97f21e476d2..d58e84f6dd8 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "qemu/lockable.h" #include "cpu.h" -#include "trace/trace-root.h" #include "trace/control.h" diff --git a/trace/control.c b/trace/control.c index ef107829ac0..1c8c50064af 100644 --- a/trace/control.c +++ b/trace/control.c @@ -27,7 +27,6 @@ #include "qemu/error-report.h" #include "qemu/config-file.h" #include "monitor/monitor.h" -#include "trace/trace-root.h" int trace_events_enabled_count;