VirtualBox

Changeset 65316 in vbox


Ignore:
Timestamp:
Jan 16, 2017 11:08:45 AM (8 years ago)
Author:
vboxsync
Message:

VMM/HM: Fixed case in name prefixes of a few internal functions.

Location:
trunk/src/VBox/VMM
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/VMMR0/HMR0.cpp

    r62869 r65316  
    16101610 * @returns The cpu structure pointer.
    16111611 */
    1612 VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpu(void)
     1612VMMR0DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void)
    16131613{
    16141614    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
    16151615    RTCPUID idCpu = RTMpCpuId();
    1616     Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
    1617     return &g_HmR0.aCpuInfo[idCpu];
    1618 }
    1619 
    1620 
    1621 /**
    1622  * Returns the cpu structure for the current cpu.
    1623  * Keep in mind that there is no guarantee it will stay the same (long jumps to ring 3!!!).
    1624  *
    1625  * @returns The cpu structure pointer.
    1626  * @param   idCpu       id of the VCPU.
    1627  */
    1628 VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpuEx(RTCPUID idCpu)
    1629 {
    16301616    Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
    16311617    return &g_HmR0.aCpuInfo[idCpu];
    … …  
    17151701
    17161702    /* Ok, disable VT-x. */
    1717     PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
     1703    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
    17181704    AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ && pCpu->pvMemObj && pCpu->HCPhysMemObj != NIL_RTHCPHYS, VERR_HM_IPE_2);
    17191705
    … …  
    17451731        Assert(g_HmR0.fGlobalInit);
    17461732
    1747         PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
     1733        PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
    17481734        AssertReturnVoid(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ && pCpu->pvMemObj && pCpu->HCPhysMemObj != NIL_RTHCPHYS);
    17491735

  • trunk/src/VBox/VMM/VMMR0/HMR0A.asm

    r62478 r65316  
    795795; load the guest ones when necessary.
    796796;
    797 ; @cproto       DECLASM(int) HMR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
     797; @cproto       DECLASM(int) HMR0VMXStartVMhmR0DumpDescriptorM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
    798798;
    799799; @returns      eax
    … …  
    806806; @param        pfnStartVM      msc:[rbp+38h]
    807807;
    808 ; @remarks      This is essentially the same code as HMR0SVMRunWrapXMM, only the parameters differ a little bit.
     808; @remarks      This is essentially the same code as hmR0SVMRunWrapXMM, only the parameters differ a little bit.
    809809;
    810810; ASSUMING 64-bit and windows for now.
    811811ALIGNCODE(16)
    812 BEGINPROC HMR0VMXStartVMWrapXMM
     812BEGINPROC hmR0VMXStartVMWrapXMM
    813813        push    xBP
    814814        mov     xBP, xSP
    … …  
    957957        movdqa  [r10 + XMM_OFF_IN_X86FXSTATE + 0f0h], xmm15
    958958        jmp     .restore_non_volatile_host_xmm_regs
    959 ENDPROC   HMR0VMXStartVMWrapXMM
     959ENDPROC   hmR0VMXStartVMWrapXMM
    960960
    961961;;
    … …  
    963963; load the guest ones when necessary.
    964964;
    965 ; @cproto       DECLASM(int) HMR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
     965; @cproto       DECLASM(int) hmR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
    966966;
    967967; @returns      eax
    … …  
    974974; @param        pfnVMRun        msc:[rbp+38h]
    975975;
    976 ; @remarks      This is essentially the same code as HMR0VMXStartVMWrapXMM, only the parameters differ a little bit.
     976; @remarks      This is essentially the same code as hmR0VMXStartVMWrapXMM, only the parameters differ a little bit.
    977977;
    978978; ASSUMING 64-bit and windows for now.
    979979ALIGNCODE(16)
    980 BEGINPROC HMR0SVMRunWrapXMM
     980BEGINPROC hmR0SVMRunWrapXMM
    981981        push    xBP
    982982        mov     xBP, xSP
    … …  
    11251125        movdqa  [r10 + XMM_OFF_IN_X86FXSTATE + 0f0h], xmm15
    11261126        jmp     .restore_non_volatile_host_xmm_regs
    1127 ENDPROC   HMR0SVMRunWrapXMM
     1127ENDPROC   hmR0SVMRunWrapXMM
    11281128
    11291129%endif ; VBOX_WITH_KERNEL_USING_XMM

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

    r64874 r65316  
    885885    PVM pVM              = pVCpu->CTX_SUFF(pVM);
    886886    PSVMVMCB pVmcb       = (PSVMVMCB)pVCpu->hm.s.svm.pvVmcb;
    887     PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
     887    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
    888888
    889889    /*
    … …  
    27722772    if (rcVMRun == VERR_SVM_INVALID_GUEST_STATE)
    27732773    {
    2774         HMDumpRegs(pVM, pVCpu, pCtx); NOREF(pVM);
     2774        hmDumpRegs(pVM, pVCpu, pCtx); NOREF(pVM);
    27752775#ifdef VBOX_STRICT
    27762776        Log4(("ctrl.u64VmcbCleanBits             %#RX64\n",   pVmcb->ctrl.u64VmcbCleanBits));
    … …  
    31453145
    31463146    /* Setup TSC offsetting. */
    3147     RTCPUID idCurrentCpu = HMR0GetCurrentCpu()->idCpu;
     3147    RTCPUID idCurrentCpu = hmR0GetCurrentCpu()->idCpu;
    31483148    if (   pSvmTransient->fUpdateTscOffsetting
    31493149        || idCurrentCpu != pVCpu->hm.s.idLastCpu)
    … …  
    31753175    ASMAtomicWriteBool(&pVCpu->hm.s.fCheckedTLBFlush, true);    /* Used for TLB flushing, set this across the world switch. */
    31763176    hmR0SvmFlushTaggedTlb(pVCpu);
    3177     Assert(HMR0GetCurrentCpu()->idCpu == pVCpu->hm.s.idLastCpu);
     3177    Assert(hmR0GetCurrentCpu()->idCpu == pVCpu->hm.s.idLastCpu);
    31783178
    31793179    STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatEntry, &pVCpu->hm.s.StatInGC, x);

  • trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

    r65280 r65316  
    50085008    /** @todo Add stats for resume vs launch. */
    50095009#ifdef VBOX_WITH_KERNEL_USING_XMM
    5010     int rc = HMR0VMXStartVMWrapXMM(fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
     5010    int rc = hmR0VMXStartVMWrapXMM(fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
    50115011#else
    50125012    int rc = pVCpu->hm.s.vmx.pfnStartVM(fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu);
    … …  
    51475147                {
    51485148                    pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
    5149                     HMR0DumpDescriptor(pDesc, u32Val, "CS: ");
     5149                    hmR0DumpDescriptor(pDesc, u32Val, "CS: ");
    51505150                }
    51515151
    … …  
    51555155                {
    51565156                    pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
    5157                     HMR0DumpDescriptor(pDesc, u32Val, "DS: ");
     5157                    hmR0DumpDescriptor(pDesc, u32Val, "DS: ");
    51585158                }
    51595159
    … …  
    51635163                {
    51645164                    pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
    5165                     HMR0DumpDescriptor(pDesc, u32Val, "ES: ");
     5165                    hmR0DumpDescriptor(pDesc, u32Val, "ES: ");
    51665166                }
    51675167
    … …  
    51715171                {
    51725172                    pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
    5173                     HMR0DumpDescriptor(pDesc, u32Val, "FS: ");
     5173                    hmR0DumpDescriptor(pDesc, u32Val, "FS: ");
    51745174                }
    51755175
    … …  
    51795179                {
    51805180                    pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
    5181                     HMR0DumpDescriptor(pDesc, u32Val, "GS: ");
     5181                    hmR0DumpDescriptor(pDesc, u32Val, "GS: ");
    51825182                }
    51835183
    … …  
    51875187                {
    51885188                    pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
    5189                     HMR0DumpDescriptor(pDesc, u32Val, "SS: ");
     5189                    hmR0DumpDescriptor(pDesc, u32Val, "SS: ");
    51905190                }
    51915191
    … …  
    51955195                {
    51965196                    pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
    5197                     HMR0DumpDescriptor(pDesc, u32Val, "TR: ");
     5197                    hmR0DumpDescriptor(pDesc, u32Val, "TR: ");
    51985198                }
    51995199
    … …  
    53155315#endif
    53165316
    5317     PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
     5317    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
    53185318    RTHCPHYS HCPhysCpuPage = pCpu->HCPhysMemObj;
    53195319
    … …  
    53765376    NOREF(fResume);
    53775377
    5378     PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
     5378    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
    53795379    RTHCPHYS HCPhysCpuPage = pCpu->HCPhysMemObj;
    53805380
    … …  
    88458845        pVmxTransient->u8GuestTpr = pVCpu->hm.s.vmx.pbVirtApic[XAPIC_OFF_TPR];
    88468846
    8847     PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
     8847    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
    88488848    RTCPUID  idCurrentCpu = pCpu->idCpu;
    88498849    if (   pVmxTransient->fUpdateTscOffsettingAndPreemptTimer
    … …  
    1198411984#endif
    1198511985
    11986     HMDumpRegs(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
     11986    hmDumpRegs(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
    1198711987    return VERR_VMX_INVALID_GUEST_STATE;
    1198811988}

  • trunk/src/VBox/VMM/include/HMInternal.h

    r65314 r65316  
    10991099
    11001100#ifdef IN_RING0
    1101 /** @todo r=bird: s/[[:space:]]HM/ hm/ - internal functions starts with a
    1102  *        lower cased prefix.  HMInternal.h is an internal header, so
    1103  *        everything here must be internal. */
    1104 VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpu(void);
    1105 VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpuEx(RTCPUID idCpu);
    1106 
     1101VMMR0DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void);
    11071102
    11081103# ifdef VBOX_STRICT
    1109 VMMR0DECL(void) HMDumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
    1110 VMMR0DECL(void) HMR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg);
     1104VMMR0DECL(void) hmDumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
     1105VMMR0DECL(void) hmR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg);
    11111106# else
    1112 #  define HMDumpRegs(a, b ,c)            do { } while (0)
    1113 #  define HMR0DumpDescriptor(a, b, c)    do { } while (0)
     1107#  define hmDumpRegs(a, b ,c)            do { } while (0)
     1108#  define hmR0DumpDescriptor(a, b, c)    do { } while (0)
    11141109# endif /* VBOX_STRICT */
    11151110
    11161111# ifdef VBOX_WITH_KERNEL_USING_XMM
    1117 DECLASM(int) HMR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
    1118 DECLASM(int) HMR0SVMRunWrapXMM(RTHCPHYS pVmcbHostPhys, RTHCPHYS pVmcbPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
     1112DECLASM(int) hmR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
     1113DECLASM(int) hmR0SVMRunWrapXMM(RTHCPHYS pVmcbHostPhys, RTHCPHYS pVmcbPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
    11191114# endif
    11201115
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