Skip to content

Commit b895aef

Browse files
committed
qemu: more verbose error when ISV=0
1 parent f9c367a commit b895aef

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

patches/qemu-9.1.2-utm.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,3 +1173,37 @@ index 5b1e375726..251fc58b42 100644
11731173
--
11741174
2.41.0
11751175

1176+
From dbe8b4f5efb748178bfa41cbff8875202a941421 Mon Sep 17 00:00:00 2001
1177+
From: osy <osy@turing.llc>
1178+
Date: Mon, 17 Feb 2025 07:19:28 -0800
1179+
Subject: [PATCH] hvf: arm: more verbose error when ISV=0
1180+
1181+
---
1182+
target/arm/hvf/hvf.c | 11 ++++++++++-
1183+
1 file changed, 10 insertions(+), 1 deletion(-)
1184+
1185+
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
1186+
index ec4821a61a..c558f3acd2 100644
1187+
--- a/target/arm/hvf/hvf.c
1188+
+++ b/target/arm/hvf/hvf.c
1189+
@@ -2062,7 +2062,16 @@ int hvf_vcpu_exec(CPUState *cpu)
1190+
break;
1191+
}
1192+
1193+
- assert(isv);
1194+
+ if (!isv) {
1195+
+ uint64_t pc;
1196+
+ uint32_t insn;
1197+
+
1198+
+ pc = hvf_get_reg(cpu, HV_REG_PC);
1199+
+ address_space_read(&address_space_memory, pc,
1200+
+ MEMTXATTRS_UNSPECIFIED, &insn, sizeof(insn));
1201+
+ error_report("Failed to handle EC_DATAABORT. ISV=0 with PC=0x%llx: 0x%08X. Please report this bug.", pc, insn);
1202+
+ abort();
1203+
+ }
1204+
1205+
if (iswrite) {
1206+
val = hvf_get_reg(cpu, srt);
1207+
--
1208+
2.41.0
1209+

0 commit comments

Comments
 (0)