aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-11-20 10:58:27 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-11-20 10:58:27 +0000
commitb11ce33fe0266f8ede18cfcf961536f6a209b02b (patch)
treeeaf4a8ece308a5d7ae53797b65cee86a0e6881bd
parent2e02083438962d26ef9dcc7100f3b378104183db (diff)
downloadqemu-arm-b11ce33fe0266f8ede18cfcf961536f6a209b02b.tar.gz
Revert "cpu-exec: don't overwrite exception_index"
This reverts commit e01cecabf3e04d22340d7e8b3616ef051c42c891, which breaks booting of aarch64 Linux images. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--accel/tcg/cpu-exec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index f3de96f..9b544d8 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -610,9 +610,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,
if (unlikely(atomic_read(&cpu->exit_request)
|| (use_icount && cpu->icount_decr.u16.low + cpu->icount_extra == 0))) {
atomic_set(&cpu->exit_request, 0);
- if (cpu->exception_index == -1) {
- cpu->exception_index = EXCP_INTERRUPT;
- }
+ cpu->exception_index = EXCP_INTERRUPT;
return true;
}