From nobody Fri Nov 14 18:21:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761935739; cv=none; d=zohomail.com; s=zohoarc; b=PC/3uML0qKjFME9P1kAOlKnD90sSlF04Vhf6BxMN1dASAdF9KKvZszM87ibkWrXytddMLJ+AQnuuQdFfEuBMIOf+f0F+SkDeUJtBGgeY9WMXbUqFVCOW0AJQnbB45y02QqI9ZkTeu9ecD6TgjgMRjAB/y0M95FlwFF4941IC/kw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761935739; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=pd6KmT081lP+mK8y068yakZPC/MNKPhbrMK15wWgQvM=; b=U64Cw/rc/AK5L+BP9FifUM2nhtudQuBFhLMs3HJLW2/RIGSJI3zvQTfXQLFs918WQiAenDN2C1pm4VsEQQUSXrmhG4WnTWb4foQppzgtr7WDmtNxey1TZZhb2CUbxZ9mMq7OR9PZaLCQWnSFQvRbQPxoMm0g3PKq5kjZDKHtGSw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761935739125486.93717405691086; Fri, 31 Oct 2025 11:35:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEtxP-000561-Gv; Fri, 31 Oct 2025 14:34:40 -0400 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 1vEtxM-00055C-FO for qemu-devel@nongnu.org; Fri, 31 Oct 2025 14:34:36 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEtwd-0006IW-RQ for qemu-devel@nongnu.org; Fri, 31 Oct 2025 14:34:35 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-471b80b994bso32174075e9.3 for ; Fri, 31 Oct 2025 11:33:49 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429c114c944sm4859142f8f.20.2025.10.31.11.33.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Oct 2025 11:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761935625; x=1762540425; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pd6KmT081lP+mK8y068yakZPC/MNKPhbrMK15wWgQvM=; b=Qs1v1WrNthT4tw7Tv4Cg0YdkaFJf2QlLiv3OyVxBCLvYKSPQGCvn6zmu9pvV6o7tXW IbRb2U9PxsFXnwWKUWwCQlwRoYf6ajeubNwwld1NbiJcTSiVCwuEZRhDwKbWIenTfXxB hn3ctdIlyP9Xfgu80/hQe2e1Yqy1yIDVSK/HRCELWBPckOJoCo/bggXY/ug4o7H8H1GP d9BWgCCZnJgdbIqTgmYRh8W39PbiBqyAr+JCMxXG5xdZozNLkjl9fZpa6wH5jSvg7fW+ TnUg6FSnYQuvjqkOC+EdR+Ym2RY1waDz0e5iybPJJbdc1qi3L1UUYtWPFLY6qHAsOHku 0X3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761935625; x=1762540425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pd6KmT081lP+mK8y068yakZPC/MNKPhbrMK15wWgQvM=; b=sqnKvxCTVW7RhGQQYdHFryoaQBjsNO9CXS/UeUNwN/sGo4kr0/34DnGVt1jjYxNwk0 MNr4/Xn2Q/ng23y2DLDkLJwd01V4+U2j5J3CbffhsVbRvgUpI4edd1wZcNbyMP5p/RsX EfZYheIry9Uy8WuD/8s9+85VSqELV0NZm4VDxwZm79kfVcvNzEqfSVF7DKI2YEdxdR1E 6kwxEFZZicNZat1N8EiDwCRwh4PQjOwnlNcJ2htBlNq3LUGePaK1tJ0t+JLWnB/nF8t+ bPyv0/SEOg9SReSnfl3z2Ym9KQq4HODLmpxGvh6L27u5JE1flMCQev4vjF+ZLjylhr+F 2W5A== X-Gm-Message-State: AOJu0YyIxiiD1pvvbnMWYpQfXBVlcZKcuISGpdRp2I49/OU4jl2IUvHu tK56nUAwDK8Kbkk0Df9LWt3HwSF1CigSgnGy+Ug0iF+dbqppErdetJpyOHdxzAM8OHYRLiC4VYs X9jTy X-Gm-Gg: ASbGncsuAyFm65EE9108pQUbhS63gDnoHcHZ6CHJF/l7Rf+0PBS0bw5M1P828RwnQoS NYXRsUmzNyuM0SiuD9bh9VZqKuWqkFWBKqcDaxSyDR2lMUb5DRdY9Ykbs6HMt2pyPa9P+/79g7Z EMKhpm3O+ATGtdnEqDbvPEx3UgB5xI4bSxqS+6AofST+jTDjt52g5/jIHgTQHD+M0fIKyn+gdIs lngCvyjspsTQXHksAZ7mlZEvAwqKpa9/jdUU2YPUsE2D8SnlI6Um6y5KgNH7odpV7ukxQNaQRon fe5YdOcoIwHj0zAP8CKMAk7M+9+vFISKtFBOj62/73oMxNk4khDkEQN4gKorXeUTop976e652tI 2EayUnN4sRhEv8sUO2MuEd5XksHJ4bbhZSdqNufdqr8RN9OG/iPPAPeqHgwy17+wt5aFG+wep0V EpLNR4cA== X-Google-Smtp-Source: AGHT+IEX9SkvrDkMpT4JsZN/1gRg4e7eDNj/o2HLXPTeIhz4MIvhwXIlNHJdNntcDsHrxJvE5nRnLg== X-Received: by 2002:a05:600c:1c1d:b0:475:de14:db16 with SMTP id 5b1f17b1804b1-4773086e39amr42888345e9.25.1761935624799; Fri, 31 Oct 2025 11:33:44 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 34/38] target/arm/hvf: Rename 'vgic' -> 'emu_reginfo' in trace events Date: Fri, 31 Oct 2025 18:33:06 +0000 Message-ID: <20251031183310.3778349-35-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251031183310.3778349-1-peter.maydell@linaro.org> References: <20251031183310.3778349-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761935742487158500 From: Philippe Mathieu-Daud=C3=A9 In order to extend the trace events to other registers, rename and pass the register group as argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/hvf/hvf.c | 14 ++++++++------ target/arm/hvf/trace-events | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index c882f4c89cf..26bafee259e 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1149,7 +1149,8 @@ static uint32_t hvf_reg2cp_reg(uint32_t reg) (reg >> SYSREG_OP2_SHIFT) & SYSREG_OP2_MASK); } =20 -static bool hvf_sysreg_read_cp(CPUState *cpu, uint32_t reg, uint64_t *val) +static bool hvf_sysreg_read_cp(CPUState *cpu, const char *cpname, + uint32_t reg, uint64_t *val) { ARMCPU *arm_cpu =3D ARM_CPU(cpu); CPUARMState *env =3D &arm_cpu->env; @@ -1172,7 +1173,7 @@ static bool hvf_sysreg_read_cp(CPUState *cpu, uint32_= t reg, uint64_t *val) } else { *val =3D raw_read(env, ri); } - trace_hvf_vgic_read(ri->name, *val); + trace_hvf_emu_reginfo_read(cpname, ri->name, *val); return true; } =20 @@ -1261,7 +1262,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t re= g, uint64_t *val) case SYSREG_ICC_SRE_EL1: case SYSREG_ICC_CTLR_EL1: /* Call the TCG sysreg handler. This is only safe for GICv3 regs. = */ - if (hvf_sysreg_read_cp(cpu, reg, val)) { + if (hvf_sysreg_read_cp(cpu, "GICv3", reg, val)) { return 0; } break; @@ -1432,7 +1433,8 @@ static void pmswinc_write(CPUARMState *env, uint64_t = value) } } =20 -static bool hvf_sysreg_write_cp(CPUState *cpu, uint32_t reg, uint64_t val) +static bool hvf_sysreg_write_cp(CPUState *cpu, const char *cpname, + uint32_t reg, uint64_t val) { ARMCPU *arm_cpu =3D ARM_CPU(cpu); CPUARMState *env =3D &arm_cpu->env; @@ -1455,7 +1457,7 @@ static bool hvf_sysreg_write_cp(CPUState *cpu, uint32= _t reg, uint64_t val) raw_write(env, ri, val); } =20 - trace_hvf_vgic_write(ri->name, val); + trace_hvf_emu_reginfo_write(cpname, ri->name, val); return true; } =20 @@ -1581,7 +1583,7 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t r= eg, uint64_t val) case SYSREG_ICC_SGI1R_EL1: case SYSREG_ICC_SRE_EL1: /* Call the TCG sysreg handler. This is only safe for GICv3 regs. = */ - if (hvf_sysreg_write_cp(cpu, reg, val)) { + if (hvf_sysreg_write_cp(cpu, "GICv3", reg, val)) { return 0; } break; diff --git a/target/arm/hvf/trace-events b/target/arm/hvf/trace-events index 538af6e0707..29387780e3f 100644 --- a/target/arm/hvf/trace-events +++ b/target/arm/hvf/trace-events @@ -9,7 +9,7 @@ hvf_unknown_hvc(uint64_t pc, uint64_t x0) "pc=3D0x%"PRIx64"= unknown HVC! 0x%016"PR hvf_unknown_smc(uint64_t x0) "unknown SMC! 0x%016"PRIx64 hvf_exit(uint64_t syndrome, uint32_t ec, uint64_t pc) "exit: 0x%"PRIx64" [= ec=3D0x%x pc=3D0x%"PRIx64"]" hvf_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t= cpuid) "PSCI Call x0=3D0x%016"PRIx64" x1=3D0x%016"PRIx64" x2=3D0x%016"PRIx= 64" x3=3D0x%016"PRIx64" cpuid=3D0x%x" -hvf_vgic_write(const char *name, uint64_t val) "vgic write to %s [val=3D0x= %016"PRIx64"]" -hvf_vgic_read(const char *name, uint64_t val) "vgic read from %s [val=3D0x= %016"PRIx64"]" +hvf_emu_reginfo_write(const char *cpname, const char *regname, uint64_t va= l) "[%s] write to %s [val=3D0x%016"PRIx64"]" +hvf_emu_reginfo_read(const char *cpname, const char *regname, uint64_t val= ) "[%s] read from %s [val=3D0x%016"PRIx64"]" hvf_illegal_guest_state(void) "HV_ILLEGAL_GUEST_STATE" hvf_kick_vcpu_thread(unsigned cpuidx, bool stop) "cpu:%u stop:%u" --=20 2.43.0