From patchwork Fri Dec 16 18:53:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 634423 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp988559pvb; Fri, 16 Dec 2022 10:54:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXsuVDTQtH1t46Xc2/0UDQM62RpUvMpAs2MWyT3vK/bBljnYCXGVy6FYt3lVIAtib40LkoDa X-Received: by 2002:ac8:5e8d:0:b0:3a9:6cc0:4f4d with SMTP id r13-20020ac85e8d000000b003a96cc04f4dmr7516069qtx.66.1671216852683; Fri, 16 Dec 2022 10:54:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671216852; cv=none; d=google.com; s=arc-20160816; b=ef9hUrV2cVzbm4g1yhqrdRQQlldoKh6RAA9xOfS/xoHBA8mf2g/fFvlZCJkESVVHP4 EVJy/VJMXTdLfW9R1YHwzH/z3rImeF3TaaBlqOr7mjvdEJh4CiUlpiHv4BAGNrr5l6KU 3Gyv9eWH3LCMUfEq0HtixW3o9+fMUoDgVyt/lOM7rOGWrlnfXFZ6ZUBfo18H7PlLLVtL eHdkt+XSLMZ4flffRJlySUSORXXjWa8xLBNfUnuJCExJW7dwtEii7v13LNVERZAe0tae Y3RnVu1LsTKNyHYdknrGgV9tqtiiTTAhkw2q0QMVIVPDKdb313J3hQEhADjLIQNcCWde eEWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=L1M2wRoJOi+BqzGwIPM2hSiFC08op8oobTL1vRrCJmc=; b=aNh6NnfepvYydRNMOPcASV/qxqC89n+fbib94NB0hXu76c5xYsr7bMMblZHb4rE7GY zhr+FArq49vbJIrIot0/ZhQgwincDKfWiwf1w9gpX9RVr97J+KONQEzKCbQxu9ObjACA T9dVcFHaNy11ffvhNBSXWBPPGAv/Tn6M5NvAgr2LQdIk/QLYwenqfZU/gfLp2TqFLFNb R67lFV1eGXy4sDOmwVeuZrVXHBkksjlHMAhcWxRNDFYELWqMkzTRRIV9P4nRu1S3sc3C TPao4aVoeZUVVLMZVF4jGwd8DPb7n+38/H0+7vgF9Jy/EolAT2aB4yFe+XDXDcN4/Cq1 XtEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Vk9cX5yD; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a13-20020aed278d000000b003a541211888si1469094qtd.358.2022.12.16.10.54.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Dec 2022 10:54:12 -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=Vk9cX5yD; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Fpz-0000Ux-7w; Fri, 16 Dec 2022 13:53:39 -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 1p6Fpu-0000Ta-Vx for qemu-devel@nongnu.org; Fri, 16 Dec 2022 13:53:35 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Fpt-0003Gv-89 for qemu-devel@nongnu.org; Fri, 16 Dec 2022 13:53:34 -0500 Received: by mail-pl1-x62f.google.com with SMTP id x2so3150954plb.13 for ; Fri, 16 Dec 2022 10:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=L1M2wRoJOi+BqzGwIPM2hSiFC08op8oobTL1vRrCJmc=; b=Vk9cX5yDaw0eTMaSyfcMtXUvf5LkIWcGWwS6OfG4EqGMUQzqV3a9sL6KTNByjCFs+x 61lyPy6YYwrqk0zZ8SiDoh7fjEy84oTqtINsSiujhI/WVbgU88tdha3xQ011TFhBsC1e AmLnpdbLqcFFXUZjgvPp6XyyYmtb2W9uRbqkjbvF3UiZRoJaj8Okiv1ANODfut0AJrGt gv/mYrkOmhlrCIa6VK90R/QvGo8AOXMDFe7hNMoD++3B1O54rdTWYrvAczhxRAqzkAzg skIOMZH7JgpdECEJT2DRn81ELc+nX/+x0RckVsEjw1BoHnCqVMFr4DOP2egcPqDTVuAb GnTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=L1M2wRoJOi+BqzGwIPM2hSiFC08op8oobTL1vRrCJmc=; b=aekSeBMEhwM51eP+bp7bDB9m+R0wLsgSgUJpxCVIyzUB+EEyYUrst9p1eclVEJloo2 zGJYkAk3oraewY33sYGubz/QIN9yuoRqnrypicQJ0ZYjjBWzOmrWh6EI2MbA6cTT80Ks cvdIaXPC53ksX3sza/7no+6YNi8RP2QheGnCs5gXwkFOouFe+dqrBu2FWI6gmRoLDkZb ZLBaSJ9Ll7tsb61F57icbAhEXQDBUQ2sja9O5TMc1eUnJZ5xruKW0J4qq+jXJ1XjFTHs J71BntAPhsMivwT8D+Pcfn8MlH7IiUEk2MpzsjQ1aaBg+eRUc9CjoQzEFBgVJKj+1wxY 3iyw== X-Gm-Message-State: ANoB5pmVtrvFAwOzKQi2gY9XOHz4XJvPqklRK7jOI/GF9u2efVQelm8J Oe80UOcvkzEO9XnxjzTZWpRkVAw872GBkGOP X-Received: by 2002:a05:6a21:2d8b:b0:a0:462f:8e3e with SMTP id ty11-20020a056a212d8b00b000a0462f8e3emr42296030pzb.55.1671216811875; Fri, 16 Dec 2022 10:53:31 -0800 (PST) Received: from stoup.. ([2602:47:d48c:8101:c606:9489:98df:6a3b]) by smtp.gmail.com with ESMTPSA id 13-20020a630b0d000000b0046ff3634a78sm1761300pgl.71.2022.12.16.10.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 10:53:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= Subject: [PULL 10/13] accel/tcg: Remove trace events from trace-root.h Date: Fri, 16 Dec 2022 10:53:02 -0800 Message-Id: <20221216185305.3429913-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221216185305.3429913-1-richard.henderson@linaro.org> References: <20221216185305.3429913-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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 From: Philippe Mathieu-Daudé Commit d9bb58e510 ("tcg: move tcg related files into accel/tcg/ subdirectory") introduced accel/tcg/trace-events, so we don't need to use the root trace-events anymore. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20221209093649.43738-3-philmd@linaro.org> Signed-off-by: Richard Henderson --- accel/tcg/cputlb.c | 2 +- accel/tcg/trace-events | 4 ++++ trace-events | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 6f1c00682b..ac459478f4 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -33,7 +33,7 @@ #include "qemu/atomic.h" #include "qemu/atomic128.h" #include "exec/translate-all.h" -#include "trace/trace-root.h" +#include "trace.h" #include "tb-hash.h" #include "internal.h" #ifdef CONFIG_PLUGIN diff --git a/accel/tcg/trace-events b/accel/tcg/trace-events index 59eab96f26..4e9b450520 100644 --- a/accel/tcg/trace-events +++ b/accel/tcg/trace-events @@ -6,5 +6,9 @@ exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=0x%x" +# cputlb.c +memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned size) "0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u" +memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64 + # translate-all.c translate_block(void *tb, uintptr_t pc, const void *tb_code) "tb:%p, pc:0x%"PRIxPTR", tb_code:%p" diff --git a/trace-events b/trace-events index 035f3d570d..b6b84b175e 100644 --- a/trace-events +++ b/trace-events @@ -42,10 +42,6 @@ find_ram_offset(uint64_t size, uint64_t offset) "size: 0x%" PRIx64 " @ 0x%" PRIx find_ram_offset_loop(uint64_t size, uint64_t candidate, uint64_t offset, uint64_t next, uint64_t mingap) "trying size: 0x%" PRIx64 " @ 0x%" PRIx64 ", offset: 0x%" PRIx64" next: 0x%" PRIx64 " mingap: 0x%" PRIx64 ram_block_discard_range(const char *rbname, void *hva, size_t length, bool need_madvise, bool need_fallocate, int ret) "%s@%p + 0x%zx: madvise: %d fallocate: %d ret: %d" -# accel/tcg/cputlb.c -memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned size) "0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u" -memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64 - # 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)"