VirtualBox

Changeset 87764 in vbox for trunk


Ignore:
Timestamp:
Feb 15, 2021 11:49:16 PM (4 years ago)
Author:
vboxsync
Message:

VMM/TM: Experimenting with changing the signature of TMTimerFromMilli. Work in progress. bugref:9943

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/VBox/vmm/tm.h

    r87763 r87764  
    257257VMMDECL(uint64_t)       TMTimerFromNano(PTMTIMER pTimer, uint64_t cNanoSecs);
    258258VMMDECL(uint64_t)       TMTimerFromMicro(PTMTIMER pTimer, uint64_t cMicroSecs);
    259 VMMDECL(uint64_t)       TMTimerFromMilli(PTMTIMER pTimer, uint64_t cMilliSecs);
     259VMMDECL(uint64_t)       TMTimerFromMilli(PVMCC pVM, PTMTIMER pTimer, uint64_t cMilliSecs);
    260260
    261261VMMDECL(bool)           TMTimerPollBool(PVMCC pVM, PVMCPUCC pVCpu);
  • trunk/src/VBox/VMM/VMMAll/TMAll.cpp

    r87760 r87764  
    25342534 *
    25352535 * @returns timer clock ticks.
     2536 * @param   pVM             The cross context VM structure.
    25362537 * @param   pTimer          Timer handle as returned by one of the create functions.
    25372538 * @param   cMilliSecs      The millisecond value ticks to convert.
    25382539 * @remark  There could be rounding and overflow errors here.
    25392540 */
    2540 VMMDECL(uint64_t) TMTimerFromMilli(PTMTIMER pTimer, uint64_t cMilliSecs)
    2541 {
     2541VMMDECL(uint64_t) TMTimerFromMilli(PVMCC pVM, PTMTIMER pTimer, uint64_t cMilliSecs)
     2542{
     2543    RT_NOREF(pVM);
     2544    Assert(pVM == pTimer->CTX_SUFF(pVM));
    25422545#ifdef IN_RING0
    25432546    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
  • trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp

    r87760 r87764  
    423423}
    424424
    425 
    426425/** @interface_method_impl{PDMDEVHLPR0,pfnTimerFromMicro} */
    427426static DECLCALLBACK(uint64_t) pdmR0DevHlp_TimerFromMicro(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, uint64_t cMicroSecs)
     
    434433static DECLCALLBACK(uint64_t) pdmR0DevHlp_TimerFromMilli(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, uint64_t cMilliSecs)
    435434{
    436     return TMTimerFromMilli(pdmR0DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs);
     435    PDMDEV_ASSERT_DEVINS(pDevIns);
     436    return TMTimerFromMilli(pDevIns->Internal.s.pGVM, pdmR0DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs);
    437437}
    438438
  • trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

    r87760 r87764  
    467467static DECLCALLBACK(uint64_t) pdmR3DevHlp_TimerFromMilli(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, uint64_t cMilliSecs)
    468468{
    469     return TMTimerFromMilli(pdmR3DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs);
     469    PDMDEV_ASSERT_DEVINS(pDevIns);
     470    return TMTimerFromMilli(pDevIns->Internal.s.pVMR3, pdmR3DevHlp_TimerToPtr(pDevIns, hTimer), cMilliSecs);
    470471}
    471472
  • trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

    r87762 r87764  
    18621862static DECLCALLBACK(uint64_t) pdmR3UsbHlp_TimerFromMilli(PPDMUSBINS pUsbIns, TMTIMERHANDLE hTimer, uint64_t cMilliSecs)
    18631863{
    1864     return TMTimerFromMilli(pdmR3UsbHlp_TimerToPtr(pUsbIns, hTimer), cMilliSecs);
     1864    PDMUSB_ASSERT_USBINS(pUsbIns);
     1865    return TMTimerFromMilli(pUsbIns->Internal.s.pVM, pdmR3UsbHlp_TimerToPtr(pUsbIns, hTimer), cMilliSecs);
    18651866}
    18661867
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