Changeset 74398 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 21, 2018 5:04:30 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 GCC build fixes.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -4110 +4110 @@
                 &&  pMsr->u32Msr != MSR_IA32_SMM_MONITOR_CTL)
             {
-                rc = CPUMSetGuestMsr(pVCpu, pMsr->u32Msr, pMsr->u64Value);
-                if (rc == VINF_SUCCESS)
+                VBOXSTRICTRC rcStrict = CPUMSetGuestMsr(pVCpu, pMsr->u32Msr, pMsr->u64Value);
+                if (rcStrict == VINF_SUCCESS)
                     continue;
 
@@ -4122 +4122 @@
                  */
                 pVmcs->u64ExitQual.u = idxMsr;
-                VMXVDIAG const enmDiag = rc == VINF_CPUM_R3_MSR_WRITE
+                VMXVDIAG const enmDiag = rcStrict == VINF_CPUM_R3_MSR_WRITE
                                        ? kVmxVDiag_Vmentry_MsrLoadRing3
                                        : kVmxVDiag_Vmentry_MsrLoad;
@@ -4829 +4829 @@
             &&  pMsr->u32Msr != MSR_IA32_SMBASE)
         {
-            int rc = CPUMQueryGuestMsr(pVCpu, pMsr->u32Msr, &pMsr->u64Value);
-            if (rc == VINF_SUCCESS)
+            VBOXSTRICTRC rcStrict = CPUMQueryGuestMsr(pVCpu, pMsr->u32Msr, &pMsr->u64Value);
+            if (rcStrict == VINF_SUCCESS)
                 continue;
 
@@ -4841 +4841 @@
              */
             pVCpu->cpum.GstCtx.hwvirt.vmx.uAbortAux = pMsr->u32Msr;
-            VMXVDIAG const enmDiag = rc == VINF_CPUM_R3_MSR_READ
+            VMXVDIAG const enmDiag = rcStrict == VINF_CPUM_R3_MSR_READ
                                    ? kVmxVDiag_Vmexit_MsrStoreRing3
                                    : kVmxVDiag_Vmexit_MsrStore;
@@ -4921 +4921 @@
      */
     iemVmxVmexitLoadHostControlRegsMsrs(pVCpu);
+    return VINF_SUCCESS;
 }