From patchwork Wed Dec 21 05:03:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 635602 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3320655pvb; Tue, 20 Dec 2022 21:09:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5Rop6pQEH/eprg8HObgY11eD4zNylrXNBeZv9TIIx7aLrLLcMcf/WfAKtLfJMQZmyRQVU X-Received: by 2002:ac8:4a82:0:b0:3a5:74e5:8b81 with SMTP id l2-20020ac84a82000000b003a574e58b81mr6980473qtq.21.1671599372416; Tue, 20 Dec 2022 21:09:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671599372; cv=none; d=google.com; s=arc-20160816; b=OJ8Ld+aFtj4JjJHcomTJMjQ8EKV8ChOhvBIwDcpBmvb3vmTW2RQ5j8OTtXFauVucnC uIyLqke9REwnGYvGy8LpJLmCwrRQ7srTCkwNULSVSMll5o/tJHi9rAufuKM1U7WEz0He vxSA6Ro7v0Ke33z5P9P0tu4zXcdLgoXxvVto8Py8g/pgg11g9JoNqnmaiaH2sBVY+zNb stDcFYKGOvr1c7dfrNS/SHrfhneombvWLT2FZy9P3ouKKyz0lVO76OPSUM8ExJvjQU1H HvpBKALk6/CEqbES+5uzsX2yu9u2aUC5HkyQVBop4yN02oYkXB3Jmoe+srGQwoR1/t29 9H3w== 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=FVZJ3eMUX8h58aRe7TsPBBhfdzuw1IHWvbf37pBP6WXKKj3ao1Q0o840B+/cH8GU4s lPySotm38R6HF9koaRL8kf1JzJaZ3rI6CvPeL96hTx5+Sv9P0/5ONA7EWlYgxuxetFsK kIz5jIFGuhIdNyxT+0bxnl2FdY2ImMKto1bRTs/9F93+3DQ+mXT0FMoM3pOWeG3Ll0Vo 2PevD7I76y2TpSz8wkh8VUFtABpNtO1wzQco0UwQWQMfiv0ttQz8S9wCEIna3Q4C2Csj YT26uRKIWzfodoLDm0VQElwcxiSUpzUOxo3U7tjqU0UouBKFk2AxMtLGiJlcamMZbg4l +7qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xYODdjB9; 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 fb10-20020a05622a480a00b003a54666a965si6098814qtb.183.2022.12.20.21.09.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Dec 2022 21:09:32 -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=xYODdjB9; 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 1p7rGQ-0002Jy-2V; Wed, 21 Dec 2022 00:03:34 -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 1p7rGM-0002II-8D for qemu-devel@nongnu.org; Wed, 21 Dec 2022 00:03:30 -0500 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7rGK-0003P9-Fj for qemu-devel@nongnu.org; Wed, 21 Dec 2022 00:03:29 -0500 Received: by mail-pj1-x102c.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so995743pje.5 for ; Tue, 20 Dec 2022 21:03:28 -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=xYODdjB9+Fmmdza1GhwZWsKcYARE/16mGbfGVghWwPCx1jYOU66Il4kjUbnuoRf4+r j9jdx7QYorP81e4uUiN5/wOL2HKJb2tQVDdab1ivyS1Zq5WwwKdSvsZ0UIauaR0/R0c/ xlgT6HuBLLzBQ74HEURnE/f7F3SuFlvprw3Dn6xS4aVV57fo/qxbXj9SENaRpnX6W8Ch dWSPk8I6gUnQOP9h/wsGjB4m7QFylouJQYJ8vPTGAs3X8S4o28wiFFDU2FxWibHaZDEo Yr3OV05WtTT0TFaoRWjSs3BVDgaQebDRLogS0p+dW8IntkSiB0TAXGxsbyq19oWBKs4T qtXA== 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=M+7+sbCzU25HE/VlmGGESEddL0OA5DsI0vdMKdhwb/lRkyZU71K47Enqz0RQyxkCGt 7I1hh79UNXFqFJeDcNTHfjU2rzmDHW1zomOLaEomfL2EZLW7aat94RV/wQho4heUlfu/ lNrnTiKjFLPcLdiTGKQRc2UEiCajYFm6TWmzcT06fXEHwAFl4/yfELV4aYEvBskcB6g0 O8BquNbrC6Xy72XjBmiCITSp7+fMWeIP8G0vuTpEJ+1RbNZkIGe8mZDinbekhvsG5AH0 KmKowt0BSmYO81DZsPJdQoO25ceVKY7E6GZu9WzGKg1hGjkFoKkJ1/YLiRymblzCBN3L chWw== X-Gm-Message-State: AFqh2kr0JwJYGCAb//ODj2GkHBCBOtrCkmtmtmiiOQrIW3qcfVy9ujqo tKjFJRAuA8r+pA5yDqYReAbKWuzL/AVi3T0o X-Received: by 2002:a17:90a:cc18:b0:219:4011:b836 with SMTP id b24-20020a17090acc1800b002194011b836mr15338874pju.23.1671599007105; Tue, 20 Dec 2022 21:03:27 -0800 (PST) Received: from stoup.. ([2602:47:d48c:8101:3efa:624c:5fb:32c0]) by smtp.gmail.com with ESMTPSA id a8-20020a17090a688800b002135e8074b1sm390645pjd.55.2022.12.20.21.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 21:03:26 -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 v2 11/14] accel/tcg: Remove trace events from trace-root.h Date: Tue, 20 Dec 2022 21:03:10 -0800 Message-Id: <20221221050313.2950701-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221050313.2950701-1-richard.henderson@linaro.org> References: <20221221050313.2950701-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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)"