From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58869 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pmt4X-00085b-Js for qemu-devel@nongnu.org; Tue, 08 Feb 2011 14:18:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pmt4W-00015H-PU for qemu-devel@nongnu.org; Tue, 08 Feb 2011 14:17:57 -0500 Received: from mail-yx0-f173.google.com ([209.85.213.173]:35007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmrDC-0000yI-RV for qemu-devel@nongnu.org; Tue, 08 Feb 2011 12:18:46 -0500 Received: by yxl31 with SMTP id 31so2641489yxl.4 for ; Tue, 08 Feb 2011 09:18:46 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 8 Feb 2011 18:18:19 +0100 Message-Id: <1297185509-20996-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> References: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [CFT PATCH 02/12] cris, microblaze: use cpu_has_work List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- target-cris/exec.h | 4 +--- target-microblaze/exec.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target-cris/exec.h b/target-cris/exec.h index 93ce768..34c0132 100644 --- a/target-cris/exec.h +++ b/target-cris/exec.h @@ -37,9 +37,7 @@ static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - /* IRQ, NMI and GURU execeptions wakes us up. */ - if (env->interrupt_request - & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h index 87b2494..ab19828 100644 --- a/target-microblaze/exec.h +++ b/target-microblaze/exec.h @@ -36,9 +36,7 @@ static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - /* IRQ, NMI and GURU execeptions wakes us up. */ - if (env->interrupt_request - & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } -- 1.7.3.5