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/helper.c | |
| parent | 6a0d8a1d233120592abc547dcfd47005dac18396 (diff) | |
| download | qemu-474ea8494ae389fce546fdf3459e2a1c2ff22ac7.zip qemu-474ea8494ae389fce546fdf3459e2a1c2ff22ac7.tar.gz qemu-474ea8494ae389fce546fdf3459e2a1c2ff22ac7.tar.bz2 | |
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/helper.c')
| -rw-r--r-- | target-i386/helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 69c2051..b2c8299 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -2383,6 +2383,7 @@ void helper_iret_real(int shift) if (shift == 0) eflags_mask &= 0xffff; load_eflags(new_eflags, eflags_mask); + env->hflags &= ~HF_NMI_MASK; } static inline void validate_seg(int seg_reg, int cpl) @@ -2634,6 +2635,7 @@ void helper_iret_protected(int shift, int next_eip) } else { helper_ret_protected(shift, 1, 0); } + env->hflags &= ~HF_NMI_MASK; #ifdef USE_KQEMU if (kqemu_is_ok(env)) { CC_OP = CC_OP_EFLAGS; |