Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 76096)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 76097)
@@ -2292,8 +2292,8 @@
 
     fVal |= VMX_PIN_CTLS_EXT_INT_EXIT                        /* External interrupts cause a VM-exit. */
-          | VMX_PIN_CTLS_NMI_EXIT;                           /* Non-maskable interrupts (NMIs) cause a VM-exit. */
+         |  VMX_PIN_CTLS_NMI_EXIT;                           /* Non-maskable interrupts (NMIs) cause a VM-exit. */
 
     if (pVM->hm.s.vmx.Msrs.PinCtls.n.allowed1 & VMX_PIN_CTLS_VIRT_NMI)
-        fVal |= VMX_PIN_CTLS_VIRT_NMI;                        /* Use virtual NMIs and virtual-NMI blocking features. */
+        fVal |= VMX_PIN_CTLS_VIRT_NMI;                       /* Use virtual NMIs and virtual-NMI blocking features. */
 
     /* Enable the VMX preemption timer. */
@@ -2444,10 +2444,10 @@
 
     fVal |= VMX_PROC_CTLS_HLT_EXIT                                    /* HLT causes a VM-exit. */
-          | VMX_PROC_CTLS_USE_TSC_OFFSETTING                          /* Use TSC-offsetting. */
-          | VMX_PROC_CTLS_MOV_DR_EXIT                                 /* MOV DRx causes a VM-exit. */
-          | VMX_PROC_CTLS_UNCOND_IO_EXIT                              /* All IO instructions cause a VM-exit. */
-          | VMX_PROC_CTLS_RDPMC_EXIT                                  /* RDPMC causes a VM-exit. */
-          | VMX_PROC_CTLS_MONITOR_EXIT                                /* MONITOR causes a VM-exit. */
-          | VMX_PROC_CTLS_MWAIT_EXIT;                                 /* MWAIT causes a VM-exit. */
+         |  VMX_PROC_CTLS_USE_TSC_OFFSETTING                          /* Use TSC-offsetting. */
+         |  VMX_PROC_CTLS_MOV_DR_EXIT                                 /* MOV DRx causes a VM-exit. */
+         |  VMX_PROC_CTLS_UNCOND_IO_EXIT                              /* All IO instructions cause a VM-exit. */
+         |  VMX_PROC_CTLS_RDPMC_EXIT                                  /* RDPMC causes a VM-exit. */
+         |  VMX_PROC_CTLS_MONITOR_EXIT                                /* MONITOR causes a VM-exit. */
+         |  VMX_PROC_CTLS_MWAIT_EXIT;                                 /* MWAIT causes a VM-exit. */
 
     /* We toggle VMX_PROC_CTLS_MOV_DR_EXIT later, check if it's not -always- needed to be set or clear. */
@@ -2465,6 +2465,6 @@
         Assert(!pVM->hm.s.vmx.fUnrestrictedGuest);                /* Paranoia. */
         fVal |= VMX_PROC_CTLS_INVLPG_EXIT
-              | VMX_PROC_CTLS_CR3_LOAD_EXIT
-              | VMX_PROC_CTLS_CR3_STORE_EXIT;
+             |  VMX_PROC_CTLS_CR3_LOAD_EXIT
+             |  VMX_PROC_CTLS_CR3_STORE_EXIT;
     }
 
@@ -2493,5 +2493,5 @@
         {
             fVal |= VMX_PROC_CTLS_CR8_STORE_EXIT                  /* CR8 reads cause a VM-exit. */
-                  | VMX_PROC_CTLS_CR8_LOAD_EXIT;                  /* CR8 writes cause a VM-exit. */
+                 |  VMX_PROC_CTLS_CR8_LOAD_EXIT;                  /* CR8 writes cause a VM-exit. */
         }
     }
@@ -3682,5 +3682,5 @@
                 /* The guest doesn't have paging enabled, make CR3 access cause a VM-exit to update our shadow. */
                 uProcCtls |= VMX_PROC_CTLS_CR3_LOAD_EXIT
-                           | VMX_PROC_CTLS_CR3_STORE_EXIT;
+                          |  VMX_PROC_CTLS_CR3_STORE_EXIT;
             }
 
@@ -3730,15 +3730,15 @@
 #ifdef HMVMX_ALWAYS_TRAP_ALL_XCPTS
         uXcptBitmap |= 0
-                     | RT_BIT(X86_XCPT_BP)
-                     | RT_BIT(X86_XCPT_DE)
-                     | RT_BIT(X86_XCPT_NM)
-                     | RT_BIT(X86_XCPT_TS)
-                     | RT_BIT(X86_XCPT_UD)
-                     | RT_BIT(X86_XCPT_NP)
-                     | RT_BIT(X86_XCPT_SS)
-                     | RT_BIT(X86_XCPT_GP)
-                     | RT_BIT(X86_XCPT_PF)
-                     | RT_BIT(X86_XCPT_MF)
-                     ;
+                    |  RT_BIT(X86_XCPT_BP)
+                    |  RT_BIT(X86_XCPT_DE)
+                    |  RT_BIT(X86_XCPT_NM)
+                    |  RT_BIT(X86_XCPT_TS)
+                    |  RT_BIT(X86_XCPT_UD)
+                    |  RT_BIT(X86_XCPT_NP)
+                    |  RT_BIT(X86_XCPT_SS)
+                    |  RT_BIT(X86_XCPT_GP)
+                    |  RT_BIT(X86_XCPT_PF)
+                    |  RT_BIT(X86_XCPT_MF)
+                    ;
 #elif defined(HMVMX_ALWAYS_TRAP_PF)
         uXcptBitmap |= RT_BIT(X86_XCPT_PF);
@@ -3852,5 +3852,5 @@
             /* VMX_EPT_MEMTYPE_WB support is already checked in hmR0VmxSetupTaggedTlb(). */
             pVCpu->hm.s.vmx.HCPhysEPTP |= VMX_EPT_MEMTYPE_WB
-                                        | (VMX_EPT_PAGE_WALK_LENGTH_DEFAULT << VMX_EPT_PAGE_WALK_LENGTH_SHIFT);
+                                       |  (VMX_EPT_PAGE_WALK_LENGTH_DEFAULT << VMX_EPT_PAGE_WALK_LENGTH_SHIFT);
 
             /* Validate. See Intel spec. 26.2.1 "Checks on VMX Controls" */
@@ -6522,6 +6522,7 @@
         if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
         {
-            rc =  hmR0VmxImportGuestRip(pVCpu);
+            rc  = hmR0VmxImportGuestRip(pVCpu);
             rc |= hmR0VmxImportGuestRFlags(pVCpu);
+            AssertRCReturn(rc, rc);
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
         }
@@ -6532,6 +6533,7 @@
     else
     {
-        rc =  hmR0VmxImportGuestRip(pVCpu);
+        rc  = hmR0VmxImportGuestRip(pVCpu);
         rc |= hmR0VmxImportGuestRFlags(pVCpu);
+        AssertRCReturn(rc, rc);
 
         if (u32Val & (  VMX_VMCS_GUEST_INT_STATE_BLOCK_MOVSS