From b11ce33fe0266f8ede18cfcf961536f6a209b02b Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 20 Nov 2017 10:58:27 +0000 Subject: [PATCH] Revert "cpu-exec: don't overwrite exception_index" This reverts commit e01cecabf3e04d22340d7e8b3616ef051c42c891, which breaks booting of aarch64 Linux images. Signed-off-by: Peter Maydell --- accel/tcg/cpu-exec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index f3de96f346..9b544d88c8 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; }