From patchwork Tue Jan 18 12:28:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 532867 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3646049imp; Tue, 18 Jan 2022 05:11:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzTmdcyH4egHlZyNENM79ZvluBZZgkWSfdkqqShH173N2p3tmgdwW1AaXctU5J/jFwTgrUR X-Received: by 2002:a25:145:: with SMTP id 66mr17759852ybb.234.1642511461194; Tue, 18 Jan 2022 05:11:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642511461; cv=none; d=google.com; s=arc-20160816; b=dGkbi2WI6HX/KLX0K4+qzz0kxpsvwhYSHW/Ro51nre9kiUTHwcaz7mCj/PcecXXKpW WGuMtD+IM5mEUrh5ZwSN/e6+6vGl7D4CylF7pcTNVvydNDPxC7nN2FhjOenEJdEdMbtr VkKw6V4hGARIp3gG3iIPiTtAfvdtrNAXCkO1Cu8NsGLgYjjnk3uCwXC6hPu9BM9IzrS6 hgJLQ0ng1P7nXU4gkgjf9EWiMl4m8m6znuJTTJRmaJ3GU19bWsJjRHwK+DTRvD7IgBEz NZttYQVmA0Uyq89nq17j9PjwDcllKDZYPbwfGOQhVNP+v0ogDwpdX5z5/gaUz3O0emP2 tM3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from; bh=AqUVPvhbNgFpvU6jFCFzUpoNRhrChIl7U1IwN+8gFto=; b=JKlVq4OsJ+BxZkBD/uxPDQKKjAz0gsDl7wk1Gv18SlYpPgeU+lDB1JMj4fHVAyEOC5 YT+er2N+2swCHvGKAd7QuMbvpZfMtpRJkrbwSpVIBQdl1quZQhrUGt6KSdoAVlXUBmIs qV0zIJCIhwgvWyDIyBKBk2jn+YEX6j8AwuNIDvZVjOjx21sJIthFREMpf75/MsNZUp4N l3skfSOMymEZTIPlLDZvIlrA1F5q338iHEirkaM6VfEeVzd9aP8NEepDRLXWtwKfDxqZ gEGGtyv/VGQYn4ARKtl6Ed8ZF3TXgDUBq6KDUdWq7P6+B1czY747z+TxScQSCXvKl8Jv MKSA== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w14si2664545ybi.3.2022.01.18.05.11.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jan 2022 05:11:01 -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; 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" Received: from localhost ([::1]:47038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9oGK-0005VN-KO for patch@linaro.org; Tue, 18 Jan 2022 08:11:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbg-0004dK-AM; Tue, 18 Jan 2022 07:29:00 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:43741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbe-0001vF-HW; Tue, 18 Jan 2022 07:28:59 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MN67J-1mrRwJ27sb-00J2Vw; Tue, 18 Jan 2022 13:28:54 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 7/9] linux-user: Rename user_force_sig tracepoint to match function name Date: Tue, 18 Jan 2022 13:28:45 +0100 Message-Id: <20220118122847.636461-8-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Tsl2Q16fvXB8FNfFf/v1PpOY2UMUt9fOCM4ty45DVnz1nkd6cae YlNfvO/fFe5BP9rIkJrs8qcFP2dJ9g6pNtXrccv7ZFyYNlH8QmTd3gcw31E9jLrL2KgIyv4 WA45vBcI/8o743Ommt3fiPVy5qglfZmppucjymAeul0JJsf4dLgU3IIanKrp1D+vTMWfjXx XDatr/NxQa19zro6IZIHg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Thhiw20/mDc=:NwpC8qjD6mZxjPKDsN93Vm DkUBSd06aswz96tV0Fhf5kVaLhRA04DGe6SSFOx0FNmOSgXPlpC+L4vGK6oMH7+y9WsaSSAHG wYc23djdC6TKUmuvT8tBJKEPX3XqqEwllLAR2QROizuAOssRkXK1//qyCr945iORSdG28okc0 QG+akhWqVsYNMkbi4G/zOX+x1T7rk7MvfwOvCZcimWzd8zyizT2z4pw69zcvQId0GRkbjUzjA Suceq2X6c3Am9dmcaES/NMAfbp6ksgGuSSOYIF1P1hs5mVpWQnIH0YV/UKeepgX2EJa4+5kxn vJIfNUUjGWPFSF5wERH3rMiYMFHNMG0PmF/CQIwBGK/ngAjFqGC7dshxukJUfKY13z5ostCUf O+w7E296X2+3t9QQ7YJXGHWXCNyDz6j3lMNm63FQmHZGPf3Rx3hGygOA/X7FhsB5xAOEgzRuG tdWUGC/wZhG4GkeIQSoc/0Z5eOimCVQv1KNp/66I4YNYmYm7XeKvGzScNJazyvU+XLxDGm3QB EnovDAjsDH8W0MhqdGeCtGYh02xpsGzq3uxRstvSxFD+jcle28vnLGeKlbrDwmEtik49L3mB8 k72P5vXUnjDo9TyOzlKfbKAOCVYWiXmlwISLSQalQyw2bTf47g0NY2lS1+5lQkF3NuCZjhNr9 aCZOokwaYQvrJROzayiUL5/7tCqqiv6c4fATDkLK29CASQGgVHflifkAZBTW8kgzv24E= Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell In commit c599d4d6d6e9bfdb64 in 2016 we renamed the old force_sig() function to dump_core_and_abort(), but we forgot to rename the associated tracepoint. Rename the tracepoint to to match the function it's called from. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220114153732.3767229-3-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/signal.c | 2 +- linux-user/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index f813b4f18e44..bfbbeab9ad2e 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -734,7 +734,7 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) struct sigaction act; host_sig = target_to_host_signal(target_sig); - trace_user_force_sig(env, target_sig, host_sig); + trace_user_dump_core_and_abort(env, target_sig, host_sig); gdb_signalled(env, target_sig); /* dump core if supported by target binary format */ diff --git a/linux-user/trace-events b/linux-user/trace-events index e7d2f54e9401..f33717f248af 100644 --- a/linux-user/trace-events +++ b/linux-user/trace-events @@ -9,7 +9,7 @@ user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 -user_force_sig(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" +user_dump_core_and_abort(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" user_handle_signal(void *env, int target_sig) "env=%p signal %d" user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d)" user_queue_signal(void *env, int target_sig) "env=%p signal %d"