VirtualBox

Changeset 81861 in vbox


Ignore:
Timestamp:
Nov 15, 2019 3:58:56 AM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
134655
Message:

VMM/HM: Spaces.

Location:
trunk/src/VBox/VMM/VMMR0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMR0/HMR0.cpp

    r81733 r81861  
    784784static DECLCALLBACK(void) hmR0EnableCpuCallback(RTCPUID idCpu, void *pvUser1, void *pvUser2)
    785785{
    786     PVMCC             pVM      = (PVMCC)pvUser1;     /* can be NULL! */
     786    PVMCC           pVM      = (PVMCC)pvUser1;     /* can be NULL! */
    787787    PHMR0FIRSTRC    pFirstRc = (PHMR0FIRSTRC)pvUser2;
    788788    AssertReturnVoid(g_HmR0.fGlobalInit);
  • trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

    r81806 r81861  
    37453745{
    37463746    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    3747 
    37483747    uint32_t       fVal = pVM->hm.s.vmx.Msrs.ProcCtls.n.allowed0;     /* Bits set here must be set in the VMCS. */
    37493748    uint32_t const fZap = pVM->hm.s.vmx.Msrs.ProcCtls.n.allowed1;     /* Bits cleared here must be cleared in the VMCS. */
     
    46634662    if (ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged) & HM_CHANGED_VMX_ENTRY_EXIT_CTLS)
    46644663    {
    4665         PVMCC        pVM            = pVCpu->CTX_SUFF(pVM);
     4664        PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    46664665        PVMXVMCSINFO pVmcsInfo      = pVmxTransient->pVmcsInfo;
    46674666        bool const   fGstInLongMode = CPUMIsGuestInLongModeEx(&pVCpu->cpum.GstCtx);
     
    53305329    if (ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged) & HM_CHANGED_GUEST_CR0)
    53315330    {
    5332         PVMCC          pVM      = pVCpu->CTX_SUFF(pVM);
     5331        PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    53335332        PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
    53345333
     
    59105909     * unusable bit and doesn't change the guest-context value.
    59115910     */
    5912     PVMCC       pVM = pVCpu->CTX_SUFF(pVM);
     5911    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    59135912    PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
    59145913    hmR0VmxImportGuestState(pVCpu, pVmcsInfo, CPUMCTX_EXTRN_CR0);
     
    61396138static int hmR0VmxExportGuestSegRegsXdtr(PVMCPUCC pVCpu, PCVMXTRANSIENT pVmxTransient)
    61406139{
    6141     int          rc        = VERR_INTERNAL_ERROR_5;
    6142     PVMCC          pVM      = pVCpu->CTX_SUFF(pVM);
     6140    int   rc  = VERR_INTERNAL_ERROR_5;
     6141    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    61436142    PCCPUMCTX    pCtx      = &pVCpu->cpum.GstCtx;
    61446143    PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
     
    63856384    AssertPtr(pVmxTransient);
    63866385
    6387     PVMCC       pVM = pVCpu->CTX_SUFF(pVM);
     6386    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    63886387    PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
    63896388
     
    67666765    bool         fParavirtTsc;
    67676766    uint64_t     uTscOffset;
    6768     PVMCC          pVM = pVCpu->CTX_SUFF(pVM);
     6767    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    67696768    PVMXVMCSINFO pVmcsInfo = hmGetVmxActiveVmcsInfo(pVCpu);
    67706769
     
    92529251                                            } while (0)
    92539252
    9254     PVMCC      pVM    = pVCpu->CTX_SUFF(pVM);
    9255     PCPUMCTX   pCtx   = &pVCpu->cpum.GstCtx;
    9256     uint32_t   uError = VMX_IGS_ERROR;
    9257     uint32_t   u32IntrState = 0;
     9253    PVMCC    pVM    = pVCpu->CTX_SUFF(pVM);
     9254    PCPUMCTX pCtx   = &pVCpu->cpum.GstCtx;
     9255    uint32_t uError = VMX_IGS_ERROR;
     9256    uint32_t u32IntrState = 0;
    92589257    bool const fUnrestrictedGuest = pVM->hm.s.vmx.fUnrestrictedGuest;
    92599258    do
     
    1523715236        uint32_t const cbValue  = s_aIOSizes[uIOSize];
    1523815237        uint32_t const cbInstr  = pVmxTransient->cbExitInstr;
    15239         bool fUpdateRipAlready = false; /* ugly hack, should be temporary. */
    15240         PVMCC pVM                 = pVCpu->CTX_SUFF(pVM);
     15238        bool  fUpdateRipAlready = false; /* ugly hack, should be temporary. */
     15239        PVMCC pVM = pVCpu->CTX_SUFF(pVM);
    1524115240        if (fIOString)
    1524215241        {
     
    1572915728         * weird case. See @bugref{6043}.
    1573015729         */
    15731         PVMCC      pVM  = pVCpu->CTX_SUFF(pVM);
     15730        PVMCC    pVM  = pVCpu->CTX_SUFF(pVM);
    1573215731        PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
    1573315732        rcStrict = PGMR0Trap0eHandlerNPMisconfig(pVM, pVCpu, PGMMODE_EPT, CPUMCTX2CORE(pCtx), GCPhys, UINT32_MAX);
     
    1581415813        uErrorCode |= X86_TRAP_PF_P;
    1581515814
    15816     PVMCC      pVM  = pVCpu->CTX_SUFF(pVM);
     15815    PVMCC    pVM  = pVCpu->CTX_SUFF(pVM);
    1581715816    PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
    1581815817    Log4Func(("at %#RX64 (%#RX64 errcode=%#x) cs:rip=%#04x:%#RX64\n", GCPhys, uExitQual, uErrorCode, pCtx->cs.Sel, pCtx->rip));
Note: See TracChangeset for help on using the changeset viewer.

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