From: Akihiko Odaki Date: Tue, 16 Jul 2024 12:50:33 +0000 (+0900) Subject: hvf: arm: Do not advance PC when raising an exception X-Git-Tag: v9.0.3~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44304ff1a80d6c1f740d5b44377a7adfe387da27;p=thirdparty%2Fqemu.git hvf: arm: Do not advance PC when raising an exception hvf did not advance PC when raising an exception for most unhandled system registers, but it mistakenly advanced PC when raising an exception for GICv3 registers. Cc: qemu-stable@nongnu.org Fixes: a2260983c655 ("hvf: arm: Add support for GICv3") Signed-off-by: Akihiko Odaki Message-id: 20240716-pmu-v3-4-8c7c1858a227@daynix.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell (cherry picked from commit 30a1690f2402e6c1582d5b3ebcf7940bfe2fad4b) Signed-off-by: Michael Tokarev --- diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index ee657f455b3..ddf49087ece 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1277,6 +1277,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint32_t rt) /* Call the TCG sysreg handler. This is only safe for GICv3 regs. */ if (!hvf_sysreg_read_cp(cpu, reg, &val)) { hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized()); + return 1; } break; case SYSREG_DBGBVR0_EL1: