Changeset 74054 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Sep 4, 2018 5:23:52 AM (7 years ago)

Author:

vboxsync

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

124813

Message:

VMM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (4 diffs)
• HM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -1035 +1035 @@
         VMXFEATDUMP("DescTableExit - Descriptor-table exiting               ", fVmxDescTableExit);
         VMXFEATDUMP("Rdtscp - Enable RDTSCP                                 ", fVmxRdtscp);
-        VMXFEATDUMP("VirtX2Apic - Virtualize-x2APIC accesses                ", fVmxVirtX2ApicAccess);
+        VMXFEATDUMP("VirtX2ApicMode - Virtualize-x2APIC mode                ", fVmxVirtX2ApicMode);
         VMXFEATDUMP("Vpid - Enable VPID                                     ", fVmxVpid);
         VMXFEATDUMP("WbinvdExit - WBINVD exiting                            ", fVmxWbinvdExit);
@@ -1139 +1139 @@
             pHostFeat->fVmxDescTableExit     = RT_BOOL(fProcCtls2 & VMX_PROC_CTLS2_DESC_TABLE_EXIT);
             pHostFeat->fVmxRdtscp            = RT_BOOL(fProcCtls2 & VMX_PROC_CTLS2_RDTSCP);
-            pHostFeat->fVmxVirtX2ApicAccess  = RT_BOOL(fProcCtls2 & VMX_PROC_CTLS2_VIRT_X2APIC_ACCESS);
+            pHostFeat->fVmxVirtX2ApicMode    = RT_BOOL(fProcCtls2 & VMX_PROC_CTLS2_VIRT_X2APIC_MODE);
             pHostFeat->fVmxVpid              = RT_BOOL(fProcCtls2 & VMX_PROC_CTLS2_VPID);
             pHostFeat->fVmxWbinvdExit        = RT_BOOL(fProcCtls2 & VMX_PROC_CTLS2_WBINVD_EXIT);
@@ -1221 +1221 @@
     EmuFeat.fVmxDescTableExit         = 1;
     EmuFeat.fVmxRdtscp                = 1;
-    EmuFeat.fVmxVirtX2ApicAccess      = 0;
+    EmuFeat.fVmxVirtX2ApicMode        = 0;
     EmuFeat.fVmxVpid                  = 0;
     EmuFeat.fVmxWbinvdExit            = 1;
@@ -1295 +1295 @@
     pGuestFeat->fVmxDescTableExit         = (pBaseFeat->fVmxDescTableExit         & EmuFeat.fVmxDescTableExit        );
     pGuestFeat->fVmxRdtscp                = (pBaseFeat->fVmxRdtscp                & EmuFeat.fVmxRdtscp               );
-    pGuestFeat->fVmxVirtX2ApicAccess      = (pBaseFeat->fVmxVirtX2ApicAccess      & EmuFeat.fVmxVirtX2ApicAccess     );
+    pGuestFeat->fVmxVirtX2ApicMode        = (pBaseFeat->fVmxVirtX2ApicMode        & EmuFeat.fVmxVirtX2ApicMode       );
     pGuestFeat->fVmxVpid                  = (pBaseFeat->fVmxVpid                  & EmuFeat.fVmxVpid                 );
     pGuestFeat->fVmxWbinvdExit            = (pBaseFeat->fVmxWbinvdExit            & EmuFeat.fVmxWbinvdExit           );

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -1493 +1493 @@
     HMVMX_REPORT_FEAT(val, zap, "DESC_TABLE_EXIT",       VMX_PROC_CTLS2_DESC_TABLE_EXIT);
     HMVMX_REPORT_FEAT(val, zap, "RDTSCP",                VMX_PROC_CTLS2_RDTSCP);
-    HMVMX_REPORT_FEAT(val, zap, "VIRT_X2APIC_ACCESS",    VMX_PROC_CTLS2_VIRT_X2APIC_ACCESS);
+    HMVMX_REPORT_FEAT(val, zap, "VIRT_X2APIC_MODE",      VMX_PROC_CTLS2_VIRT_X2APIC_MODE);
     HMVMX_REPORT_FEAT(val, zap, "VPID",                  VMX_PROC_CTLS2_VPID);
     HMVMX_REPORT_FEAT(val, zap, "WBINVD_EXIT",           VMX_PROC_CTLS2_WBINVD_EXIT);
@@ -3131 +3131 @@
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_DESC_TABLE_EXIT   );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_RDTSCP            );
-                        HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_VIRT_X2APIC_ACCESS);
+                        HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_VIRT_X2APIC_MODE  );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_VPID              );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_WBINVD_EXIT       );