Changeset 87493 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jan 30, 2021 1:57:34 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMX: Moving more stuff to HMR0PERVCPU. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)

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

@@ -6352 +6352 @@
         else
         {
-            PDISCPUSTATE pDis = &pVCpu->hm.s.DisState;
+            PDISCPUSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
             int rc = EMInterpretDisasCurrent(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, &cbInstr);
             if (   rc == VINF_SUCCESS
@@ -7050 +7050 @@
         else
         {
-            PDISCPUSTATE pDis = &pVCpu->hm.s.DisState;
+            PDISCPUSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
             int rc = EMInterpretDisasCurrent(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, &cbInstr);
             if (   rc == VINF_SUCCESS
@@ -7094 +7094 @@
     else
     {
-        PDISCPUSTATE pDis = &pVCpu->hm.s.DisState;
+        PDISCPUSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
         int rc = EMInterpretDisasCurrent(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, &cbInstr);
         if (   rc == VINF_SUCCESS
@@ -7407 +7407 @@
     if (!(pCtx->cr0 & X86_CR0_NE))
     {
-        PVMCC       pVM  = pVCpu->CTX_SUFF(pVM);
-        PDISSTATE pDis = &pVCpu->hm.s.DisState;
+        PVMCC     pVM  = pVCpu->CTX_SUFF(pVM);
+        PDISSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
         unsigned  cbInstr;
         int rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, &cbInstr);