VirtualBox

Changeset 51946 in vbox


Ignore:
Timestamp:
Jul 9, 2014 3:10:16 AM (10 years ago)
Author:
vboxsync
Message:

VMM/HMVMXR0: Comment nits

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/hm_vmx.h

    r51718 r51946  
    972972/** 36 Guest software executed MWAIT. */
    973973#define VMX_EXIT_MWAIT                                          36
    974 /** 37 VM exit due to monitor trap flag. */
     974/** 37 VM-exit due to monitor trap flag. */
    975975#define VMX_EXIT_MTF                                            37
    976976/** 39 Guest software attempted to execute MONITOR. */
    … …  
    10471047/** VMXON executed in VMX root operation. */
    10481048#define VMX_ERROR_VMXON_IN_VMX_ROOT_OP                          15
    1049 /** VM entry with invalid executive-VMCS pointer. */
     1049/** VM-entry with invalid executive-VMCS pointer. */
    10501050#define VMX_ERROR_VMENTRY_INVALID_VMCS_EXEC_PTR                 16
    1051 /** VM entry with non-launched executive VMCS. */
     1051/** VM-entry with non-launched executive VMCS. */
    10521052#define VMX_ERROR_VMENTRY_NON_LAUNCHED_EXEC_VMCS                17
    1053 /** VM entry with executive-VMCS pointer not VMXON pointer. */
     1053/** VM-entry with executive-VMCS pointer not VMXON pointer. */
    10541054#define VMX_ERROR_VMENTRY_EXEC_VMCS_PTR                         18
    10551055/** VMCALL with non-clear VMCS. */
    … …  
    10631063/** VMCALL with invalid SMM-monitor features. */
    10641064#define VMX_ERROR_VMCALL_INVALID_SMM_MONITOR                    24
    1065 /** VM entry with invalid VM-execution control fields in executive VMCS. */
     1065/** VM-entry with invalid VM-execution control fields in executive VMCS. */
    10661066#define VMX_ERROR_VMENTRY_INVALID_VM_EXEC_CTRL                  25
    1067 /** VM entry with events blocked by MOV SS. */
     1067/** VM-entry with events blocked by MOV SS. */
    10681068#define VMX_ERROR_VMENTRY_MOV_SS                                26
    10691069/** Invalid operand to INVEPT/INVVPID. */
    … …  
    13131313 * @{
    13141314 */
    1315 /** External interrupts cause VM exits if set; otherwise dispatched through the guest's IDT. */
     1315/** External interrupts cause VM-exits if set; otherwise dispatched through the guest's IDT. */
    13161316#define VMX_VMCS_CTRL_PIN_EXEC_EXT_INT_EXIT                     RT_BIT(0)
    1317 /** Non-maskable interrupts cause VM exits if set; otherwise dispatched through the guest's IDT. */
     1317/** Non-maskable interrupts cause VM-exits if set; otherwise dispatched through the guest's IDT. */
    13181318#define VMX_VMCS_CTRL_PIN_EXEC_NMI_EXIT                         RT_BIT(3)
    13191319/** Virtual NMIs. */
    … …  
    13271327 * @{
    13281328 */
    1329 /** VM Exit as soon as RFLAGS.IF=1 and no blocking is active. */
     1329/** VM-exit as soon as RFLAGS.IF=1 and no blocking is active. */
    13301330#define VMX_VMCS_CTRL_PROC_EXEC_INT_WINDOW_EXIT                 RT_BIT(2)
    13311331/** Use timestamp counter offset. */
    13321332#define VMX_VMCS_CTRL_PROC_EXEC_USE_TSC_OFFSETTING              RT_BIT(3)
    1333 /** VM Exit when executing the HLT instruction. */
     1333/** VM-exit when executing the HLT instruction. */
    13341334#define VMX_VMCS_CTRL_PROC_EXEC_HLT_EXIT                        RT_BIT(7)
    1335 /** VM Exit when executing the INVLPG instruction. */
     1335/** VM-exit when executing the INVLPG instruction. */
    13361336#define VMX_VMCS_CTRL_PROC_EXEC_INVLPG_EXIT                     RT_BIT(9)
    1337 /** VM Exit when executing the MWAIT instruction. */
     1337/** VM-exit when executing the MWAIT instruction. */
    13381338#define VMX_VMCS_CTRL_PROC_EXEC_MWAIT_EXIT                      RT_BIT(10)
    1339 /** VM Exit when executing the RDPMC instruction. */
     1339/** VM-exit when executing the RDPMC instruction. */
    13401340#define VMX_VMCS_CTRL_PROC_EXEC_RDPMC_EXIT                      RT_BIT(11)
    1341 /** VM Exit when executing the RDTSC/RDTSCP instruction. */
     1341/** VM-exit when executing the RDTSC/RDTSCP instruction. */
    13421342#define VMX_VMCS_CTRL_PROC_EXEC_RDTSC_EXIT                      RT_BIT(12)
    1343 /** VM Exit when executing the MOV to CR3 instruction. (forced to 1 on the 'first' VT-x capable CPUs; this actually includes the newest Nehalem CPUs) */
     1343/** VM-exit when executing the MOV to CR3 instruction. (forced to 1 on the 'first' VT-x capable CPUs; this actually includes the newest Nehalem CPUs) */
    13441344#define VMX_VMCS_CTRL_PROC_EXEC_CR3_LOAD_EXIT                   RT_BIT(15)
    1345 /** VM Exit when executing the MOV from CR3 instruction. (forced to 1 on the 'first' VT-x capable CPUs; this actually includes the newest Nehalem CPUs) */
     1345/** VM-exit when executing the MOV from CR3 instruction. (forced to 1 on the 'first' VT-x capable CPUs; this actually includes the newest Nehalem CPUs) */
    13461346#define VMX_VMCS_CTRL_PROC_EXEC_CR3_STORE_EXIT                  RT_BIT(16)
    1347 /** VM Exit on CR8 loads. */
     1347/** VM-exit on CR8 loads. */
    13481348#define VMX_VMCS_CTRL_PROC_EXEC_CR8_LOAD_EXIT                   RT_BIT(19)
    1349 /** VM Exit on CR8 stores. */
     1349/** VM-exit on CR8 stores. */
    13501350#define VMX_VMCS_CTRL_PROC_EXEC_CR8_STORE_EXIT                  RT_BIT(20)
    13511351/** Use TPR shadow. */
    13521352#define VMX_VMCS_CTRL_PROC_EXEC_USE_TPR_SHADOW                  RT_BIT(21)
    1353 /** VM Exit when virtual nmi blocking is disabled. */
     1353/** VM-exit when virtual nmi blocking is disabled. */
    13541354#define VMX_VMCS_CTRL_PROC_EXEC_NMI_WINDOW_EXIT                 RT_BIT(22)
    1355 /** VM Exit when executing a MOV DRx instruction. */
     1355/** VM-exit when executing a MOV DRx instruction. */
    13561356#define VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT                     RT_BIT(23)
    1357 /** VM Exit when executing IO instructions. */
     1357/** VM-exit when executing IO instructions. */
    13581358#define VMX_VMCS_CTRL_PROC_EXEC_UNCOND_IO_EXIT                  RT_BIT(24)
    13591359/** Use IO bitmaps. */
    … …  
    13631363/** Use MSR bitmaps. */
    13641364#define VMX_VMCS_CTRL_PROC_EXEC_USE_MSR_BITMAPS                 RT_BIT(28)
    1365 /** VM Exit when executing the MONITOR instruction. */
     1365/** VM-exit when executing the MONITOR instruction. */
    13661366#define VMX_VMCS_CTRL_PROC_EXEC_MONITOR_EXIT                    RT_BIT(29)
    1367 /** VM Exit when executing the PAUSE instruction. */
     1367/** VM-exit when executing the PAUSE instruction. */
    13681368#define VMX_VMCS_CTRL_PROC_EXEC_PAUSE_EXIT                      RT_BIT(30)
    13691369/** Determines whether the secondary processor based VM-execution controls are used. */
    … …  
    13861386/** VPID supported/enabled. */
    13871387#define VMX_VMCS_CTRL_PROC_EXEC2_VPID                           RT_BIT(5)
    1388 /** VM Exit when executing the WBINVD instruction. */
     1388/** VM-exit when executing the WBINVD instruction. */
    13891389#define VMX_VMCS_CTRL_PROC_EXEC2_WBINVD_EXIT                    RT_BIT(6)
    13901390/** Unrestricted guest execution. */
    … …  
    13921392/** A specified nr of pause loops cause a VM-exit. */
    13931393#define VMX_VMCS_CTRL_PROC_EXEC2_PAUSE_LOOP_EXIT                RT_BIT(10)
    1394 /** VM Exit when executing RDRAND instructions. */
     1394/** VM-exit when executing RDRAND instructions. */
    13951395#define VMX_VMCS_CTRL_PROC_EXEC2_RDRAND_EXIT                    RT_BIT(11)
    13961396/** Enables INVPCID instructions. */
    … …  
    14121412/** Disable dual treatment of SMI and SMM; must be zero for VM-entry outside of SMM. */
    14131413#define VMX_VMCS_CTRL_ENTRY_DEACTIVATE_DUALMON                  RT_BIT(11)
    1414 /** Whether the guest IA32_PERF_GLOBAL_CTRL MSR is loaded on VM entry. */
     1414/** Whether the guest IA32_PERF_GLOBAL_CTRL MSR is loaded on VM-entry. */
    14151415#define VMX_VMCS_CTRL_ENTRY_LOAD_GUEST_PERF_MSR                 RT_BIT(13)
    1416 /** Whether the guest IA32_PAT MSR is loaded on VM entry. */
     1416/** Whether the guest IA32_PAT MSR is loaded on VM-entry. */
    14171417#define VMX_VMCS_CTRL_ENTRY_LOAD_GUEST_PAT_MSR                  RT_BIT(14)
    1418 /** Whether the guest IA32_EFER MSR is loaded on VM entry. */
     1418/** Whether the guest IA32_EFER MSR is loaded on VM-entry. */
    14191419#define VMX_VMCS_CTRL_ENTRY_LOAD_GUEST_EFER_MSR                 RT_BIT(15)
    14201420/** @} */
    … …  
    14281428/** Return to long mode after a VM-exit. */
    14291429#define VMX_VMCS_CTRL_EXIT_HOST_ADDR_SPACE_SIZE                 RT_BIT(9)
    1430 /** Whether the IA32_PERF_GLOBAL_CTRL MSR is loaded on VM exit. */
     1430/** Whether the IA32_PERF_GLOBAL_CTRL MSR is loaded on VM-exit. */
    14311431#define VMX_VMCS_CTRL_EXIT_LOAD_PERF_MSR                        RT_BIT(12)
    14321432/** Acknowledge external interrupts with the irq controller if one caused a VM-exit. */
    14331433#define VMX_VMCS_CTRL_EXIT_ACK_EXT_INT                          RT_BIT(15)
    1434 /** Whether the guest IA32_PAT MSR is saved on VM exit. */
     1434/** Whether the guest IA32_PAT MSR is saved on VM-exit. */
    14351435#define VMX_VMCS_CTRL_EXIT_SAVE_GUEST_PAT_MSR                   RT_BIT(18)
    1436 /** Whether the host IA32_PAT MSR is loaded on VM exit. */
     1436/** Whether the host IA32_PAT MSR is loaded on VM-exit. */
    14371437#define VMX_VMCS_CTRL_EXIT_LOAD_HOST_PAT_MSR                    RT_BIT(19)
    1438 /** Whether the guest IA32_EFER MSR is saved on VM exit. */
     1438/** Whether the guest IA32_EFER MSR is saved on VM-exit. */
    14391439#define VMX_VMCS_CTRL_EXIT_SAVE_GUEST_EFER_MSR                  RT_BIT(20)
    1440 /** Whether the host IA32_EFER MSR is loaded on VM exit. */
     1440/** Whether the host IA32_EFER MSR is loaded on VM-exit. */
    14411441#define VMX_VMCS_CTRL_EXIT_LOAD_HOST_EFER_MSR                   RT_BIT(21)
    1442 /** Whether the value of the VMX preemption timer is saved on every VM exit. */
     1442/** Whether the value of the VMX preemption timer is saved on every VM-exit. */
    14431443#define VMX_VMCS_CTRL_EXIT_SAVE_VMX_PREEMPT_TIMER               RT_BIT(22)
    14441444/** @} */
    … …  
    17461746 * @{
    17471747 */
    1748 /** 0-11:   If the APIC-access VM exit is due to a linear access, the offset of access within the APIC page. */
     1748/** 0-11:   If the APIC-access VM-exit is due to a linear access, the offset of access within the APIC page. */
    17491749#define VMX_EXIT_QUALIFICATION_APIC_ACCESS_OFFSET(a)            ((a) & 0xfff)
    17501750/** 12-15:  Access type. */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette