Changeset 72798 in vbox

Timestamp:

Jul 2, 2018 4:06:17 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123341

Message:

VMM/HMVMXR0: Don't leave hmR0VmxImportGuestState with interrupts enabled on error.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -6340 +6340 @@
                         case MSR_IA32_SPEC_CTRL:    CPUMSetGuestSpecCtrl(pVCpu, pMsr->u64Value);    break;
                         case MSR_K8_TSC_AUX:        CPUMSetGuestTscAux(pVCpu, pMsr->u64Value);      break;
+                        case MSR_K6_EFER: /* EFER can't be changed without causing a VM-exit */     break;
                         default:
                         {
+                            pVCpu->hm.s.u32HMError = pMsr->u32Msr;
+                            ASMSetFlags(fEFlags);
                             AssertMsgFailed(("Unexpected MSR in auto-load/store area. uMsr=%#RX32 cMsrs=%u\n", pMsr->u32Msr,
                                              cMsrs));
-                            pVCpu->hm.s.u32HMError = pMsr->u32Msr;
                             return VERR_HM_UNEXPECTED_LD_ST_MSR;
                         }