From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0tqp-00010F-9n for qemu-devel@nongnu.org; Thu, 12 May 2016 12:52:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0tqk-00068r-3x for qemu-devel@nongnu.org; Thu, 12 May 2016 12:52:38 -0400 Received: from mail-lf0-x236.google.com ([2a00:1450:4010:c07::236]:33423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0tqj-00068h-DM for qemu-devel@nongnu.org; Thu, 12 May 2016 12:52:34 -0400 Received: by mail-lf0-x236.google.com with SMTP id y84so75435731lfc.0 for ; Thu, 12 May 2016 09:52:32 -0700 (PDT) From: Sergey Fedorov Date: Thu, 12 May 2016 19:52:17 +0300 Message-Id: <1463071937-26607-1-git-send-email-sergey.fedorov@linaro.org> Subject: [Qemu-devel] [PATCH v2] cpu-exec: Clean up 'interrupt_request' reloading in cpu_handle_interrupt() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sergey Fedorov , Sergey Fedorov , Paolo Bonzini , Peter Crosthwaite , Richard Henderson From: Sergey Fedorov Suggested-by: Richard Henderson Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov --- This patch applies on top of commit: 40ae3669fb55 ("cpu-exec: Remove unused 'x86_cpu' and 'env' from cpu_exec()") from: git://github.com/rth7680/qemu.git tcg-next Changes in v2: * Reload only when target hook called cpu-exec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 0ea47e997dfa..14df1aacf42a 100644 --- 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 */ -- 1.9.1