Commit 7241f532c3adbebfc8689b878aec3f244043d147
1 parent
3aa3eea3
NMI and INTR events injection should not be handled as software interrupts (Bernhard Kauer).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3952 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
2 additions
and
2 deletions
target-i386/helper.c
| @@ -4126,7 +4126,7 @@ void helper_vmrun(target_ulong addr) | @@ -4126,7 +4126,7 @@ void helper_vmrun(target_ulong addr) | ||
| 4126 | case SVM_EVTINJ_TYPE_INTR: | 4126 | case SVM_EVTINJ_TYPE_INTR: |
| 4127 | env->exception_index = vector; | 4127 | env->exception_index = vector; |
| 4128 | env->error_code = event_inj_err; | 4128 | env->error_code = event_inj_err; |
| 4129 | - env->exception_is_int = 1; | 4129 | + env->exception_is_int = 0; |
| 4130 | env->exception_next_eip = -1; | 4130 | env->exception_next_eip = -1; |
| 4131 | if (loglevel & CPU_LOG_TB_IN_ASM) | 4131 | if (loglevel & CPU_LOG_TB_IN_ASM) |
| 4132 | fprintf(logfile, "INTR"); | 4132 | fprintf(logfile, "INTR"); |
| @@ -4134,7 +4134,7 @@ void helper_vmrun(target_ulong addr) | @@ -4134,7 +4134,7 @@ void helper_vmrun(target_ulong addr) | ||
| 4134 | case SVM_EVTINJ_TYPE_NMI: | 4134 | case SVM_EVTINJ_TYPE_NMI: |
| 4135 | env->exception_index = vector; | 4135 | env->exception_index = vector; |
| 4136 | env->error_code = event_inj_err; | 4136 | env->error_code = event_inj_err; |
| 4137 | - env->exception_is_int = 1; | 4137 | + env->exception_is_int = 0; |
| 4138 | env->exception_next_eip = EIP; | 4138 | env->exception_next_eip = EIP; |
| 4139 | if (loglevel & CPU_LOG_TB_IN_ASM) | 4139 | if (loglevel & CPU_LOG_TB_IN_ASM) |
| 4140 | fprintf(logfile, "NMI"); | 4140 | fprintf(logfile, "NMI"); |