diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-13 16:08:15 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-13 16:08:15 +0000 |
| commit | 474ea8494ae389fce546fdf3459e2a1c2ff22ac7 (patch) | |
| tree | 7ff142eb7a4fd8755a54f055a0b94ce67db13051 /target-i386/exec.h | |
| parent | 6a0d8a1d233120592abc547dcfd47005dac18396 (diff) | |
| download | hqemu-474ea8494ae389fce546fdf3459e2a1c2ff22ac7.zip hqemu-474ea8494ae389fce546fdf3459e2a1c2ff22ac7.tar.gz | |
x86: Introduce CPU_INTERRUPT_NMI
(Jan Kiszka)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4205 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-i386/exec.h')
| -rw-r--r-- | target-i386/exec.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target-i386/exec.h b/target-i386/exec.h index 37fcdc0..11d12c9 100644 --- a/target-i386/exec.h +++ b/target-i386/exec.h @@ -593,8 +593,9 @@ static inline int cpu_halted(CPUState *env) { if (!(env->hflags & HF_HALTED_MASK)) return 0; /* disable halt condition */ - if ((env->interrupt_request & CPU_INTERRUPT_HARD) && - (env->eflags & IF_MASK)) { + if (((env->interrupt_request & CPU_INTERRUPT_HARD) && + (env->eflags & IF_MASK)) || + (env->interrupt_request & CPU_INTERRUPT_NMI)) { env->hflags &= ~HF_HALTED_MASK; return 0; } |
