cpu-exec: Clean up 'interrupt_request' reloading in cpu_handle_interr…

…upt() Suggested-by: Richard Henderson <[email protected]> Signed-off-by: Sergey Fedorov <[email protected]> Signed-off-by: Sergey Fedorov <[email protected]> Message-Id: <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Signed-off-by: Richard Henderson <[email protected]>
pfliu · May 13, 2016 · 8b1fe3f · 8b1fe3f
1 parent ba048a4
commit 8b1fe3f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/cpu-exec.c b/cpu-exec.c
@@ -488,10 +488,11 @@ static inline void cpu_handle_interrupt(CPUState *cpu,
             if (cc->cpu_exec_interrupt(cpu, interrupt_request)) {
                 *last_tb = NULL;
             }
+            /* The target hook may have updated the 'cpu->interrupt_request';
+             * reload the 'interrupt_request' value */
+            interrupt_request = cpu->interrupt_request;
         }
-        /* Don't use the cached interrupt_request value,
-           do_interrupt may have updated the EXITTB flag. */
-        if (cpu->interrupt_request & CPU_INTERRUPT_EXITTB) {
+        if (interrupt_request & CPU_INTERRUPT_EXITTB) {
             cpu->interrupt_request &= ~CPU_INTERRUPT_EXITTB;
             /* ensure that no TB jump will be modified as
                the program flow was changed */