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

Timestamp:

Mar 5, 2019 5:47:43 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HM: Nested VMX: bugref:9180 Rename GstCtls as Ctls for upcoming changes.

File:

• trunk/src/VBox/VMM/VMMR3/HM.cpp (modified) (5 diffs)

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

@@ -2914 +2914 @@
                 else if (pVCpu->hm.s.vmx.LastError.u32InstrError == VMXINSTRERR_VMENTRY_INVALID_CTLS)
                 {
-                    LogRel(("HM: CPU[%u] PinCtls          %#RX32\n", i, pVCpu->hm.s.vmx.GstCtls.u32PinCtls));
+                    LogRel(("HM: CPU[%u] PinCtls          %#RX32\n", i, pVCpu->hm.s.vmx.Ctls.u32PinCtls));
                     {
-                        uint32_t const u32Val = pVCpu->hm.s.vmx.GstCtls.u32PinCtls;
+                        uint32_t const u32Val = pVCpu->hm.s.vmx.Ctls.u32PinCtls;
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PIN_CTLS_EXT_INT_EXIT );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PIN_CTLS_NMI_EXIT     );
@@ -2923 +2923 @@
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PIN_CTLS_POSTED_INT   );
                     }
-                    LogRel(("HM: CPU[%u] ProcCtls         %#RX32\n", i, pVCpu->hm.s.vmx.GstCtls.u32ProcCtls));
+                    LogRel(("HM: CPU[%u] ProcCtls         %#RX32\n", i, pVCpu->hm.s.vmx.Ctls.u32ProcCtls));
                     {
-                        uint32_t const u32Val = pVCpu->hm.s.vmx.GstCtls.u32ProcCtls;
+                        uint32_t const u32Val = pVCpu->hm.s.vmx.Ctls.u32ProcCtls;
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS_INT_WINDOW_EXIT   );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS_USE_TSC_OFFSETTING);
@@ -2948 +2948 @@
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS_USE_SECONDARY_CTLS);
                     }
-                    LogRel(("HM: CPU[%u] ProcCtls2        %#RX32\n", i, pVCpu->hm.s.vmx.GstCtls.u32ProcCtls2));
+                    LogRel(("HM: CPU[%u] ProcCtls2        %#RX32\n", i, pVCpu->hm.s.vmx.Ctls.u32ProcCtls2));
                     {
-                        uint32_t const u32Val = pVCpu->hm.s.vmx.GstCtls.u32ProcCtls2;
+                        uint32_t const u32Val = pVCpu->hm.s.vmx.Ctls.u32ProcCtls2;
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_VIRT_APIC_ACCESS  );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_EPT               );
@@ -2974 +2974 @@
                         HMVMX_LOGREL_FEAT(u32Val, VMX_PROC_CTLS2_TSC_SCALING       );
                     }
-                    LogRel(("HM: CPU[%u] EntryCtls        %#RX32\n", i, pVCpu->hm.s.vmx.GstCtls.u32EntryCtls));
+                    LogRel(("HM: CPU[%u] EntryCtls        %#RX32\n", i, pVCpu->hm.s.vmx.Ctls.u32EntryCtls));
                     {
-                        uint32_t const u32Val = pVCpu->hm.s.vmx.GstCtls.u32EntryCtls;
+                        uint32_t const u32Val = pVCpu->hm.s.vmx.Ctls.u32EntryCtls;
                         HMVMX_LOGREL_FEAT(u32Val, VMX_ENTRY_CTLS_LOAD_DEBUG         );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_ENTRY_CTLS_IA32E_MODE_GUEST   );
@@ -2985 +2985 @@
                         HMVMX_LOGREL_FEAT(u32Val, VMX_ENTRY_CTLS_LOAD_EFER_MSR      );
                     }
-                    LogRel(("HM: CPU[%u] ExitCtls         %#RX32\n", i, pVCpu->hm.s.vmx.GstCtls.u32ExitCtls));
+                    LogRel(("HM: CPU[%u] ExitCtls         %#RX32\n", i, pVCpu->hm.s.vmx.Ctls.u32ExitCtls));
                     {
-                        uint32_t const u32Val = pVCpu->hm.s.vmx.GstCtls.u32ExitCtls;
+                        uint32_t const u32Val = pVCpu->hm.s.vmx.Ctls.u32ExitCtls;
                         HMVMX_LOGREL_FEAT(u32Val, VMX_EXIT_CTLS_SAVE_DEBUG            );
                         HMVMX_LOGREL_FEAT(u32Val, VMX_EXIT_CTLS_HOST_ADDR_SPACE_SIZE  );