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)"