VirtualBox

Changeset 81416 in vbox for trunk/src/VBox/VMM


Ignore:
Timestamp:
Oct 21, 2019 3:14:39 PM (5 years ago)
Author:
vboxsync
Message:

PDMDevHlp: Removed incorrect EMT restrictions on a bunch of new devhlps (copy&paste). bugref:9218

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

Legend:

Unmodified
Added
Removed

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

    r81406 r81416  
    718718    PDMDEV_ASSERT_DEVINS(pDevIns);
    719719    LogFlow(("pdmR0DevHlp_TaskTrigger: caller='%s'/%d: hTask=%RU64\n", pDevIns->pReg->szName, pDevIns->iInstance, hTask));
    720     PGVM pGVM = pDevIns->Internal.s.pGVM;
    721     VM_ASSERT_EMT(pGVM);
    722 
    723     int rc = PDMTaskTrigger(pGVM, PDMTASKTYPE_DEV, pDevIns->pDevInsForR3, hTask);
     720
     721    int rc = PDMTaskTrigger(pDevIns->Internal.s.pGVM, PDMTASKTYPE_DEV, pDevIns->pDevInsForR3, hTask);
    724722
    725723    LogFlow(("pdmR0DevHlp_TaskTrigger: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    733731    PDMDEV_ASSERT_DEVINS(pDevIns);
    734732    LogFlow(("pdmR0DevHlp_SUPSemEventSignal: caller='%s'/%d: hEvent=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEvent));
    735     PGVM pGVM = pDevIns->Internal.s.pGVM;
    736     VM_ASSERT_EMT(pGVM);
    737 
    738     int rc = SUPSemEventSignal(pGVM->pSession, hEvent);
     733
     734    int rc = SUPSemEventSignal(pDevIns->Internal.s.pGVM->pSession, hEvent);
    739735
    740736    LogFlow(("pdmR0DevHlp_SUPSemEventSignal: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    749745    LogFlow(("pdmR0DevHlp_SUPSemEventWaitNoResume: caller='%s'/%d: hEvent=%p cNsTimeout=%RU32\n",
    750746             pDevIns->pReg->szName, pDevIns->iInstance, hEvent, cMillies));
    751     PGVM pGVM = pDevIns->Internal.s.pGVM;
    752     VM_ASSERT_EMT(pGVM);
    753 
    754     int rc = SUPSemEventWaitNoResume(pGVM->pSession, hEvent, cMillies);
     747
     748    int rc = SUPSemEventWaitNoResume(pDevIns->Internal.s.pGVM->pSession, hEvent, cMillies);
    755749
    756750    LogFlow(("pdmR0DevHlp_SUPSemEventWaitNoResume: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    765759    LogFlow(("pdmR0DevHlp_SUPSemEventWaitNsAbsIntr: caller='%s'/%d: hEvent=%p uNsTimeout=%RU64\n",
    766760             pDevIns->pReg->szName, pDevIns->iInstance, hEvent, uNsTimeout));
    767     PGVM pGVM = pDevIns->Internal.s.pGVM;
    768     VM_ASSERT_EMT(pGVM);
    769 
    770     int rc = SUPSemEventWaitNsAbsIntr(pGVM->pSession, hEvent, uNsTimeout);
     761
     762    int rc = SUPSemEventWaitNsAbsIntr(pDevIns->Internal.s.pGVM->pSession, hEvent, uNsTimeout);
    771763
    772764    LogFlow(("pdmR0DevHlp_SUPSemEventWaitNsAbsIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    781773    LogFlow(("pdmR0DevHlp_SUPSemEventWaitNsRelIntr: caller='%s'/%d: hEvent=%p cNsTimeout=%RU64\n",
    782774             pDevIns->pReg->szName, pDevIns->iInstance, hEvent, cNsTimeout));
    783     PGVM pGVM = pDevIns->Internal.s.pGVM;
    784     VM_ASSERT_EMT(pGVM);
    785 
    786     int rc = SUPSemEventWaitNsRelIntr(pGVM->pSession, hEvent, cNsTimeout);
     775
     776    int rc = SUPSemEventWaitNsRelIntr(pDevIns->Internal.s.pGVM->pSession, hEvent, cNsTimeout);
    787777
    788778    LogFlow(("pdmR0DevHlp_SUPSemEventWaitNsRelIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    796786    PDMDEV_ASSERT_DEVINS(pDevIns);
    797787    LogFlow(("pdmR0DevHlp_SUPSemEventGetResolution: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
    798     PGVM pGVM = pDevIns->Internal.s.pGVM;
    799     VM_ASSERT_EMT(pGVM);
    800 
    801     uint32_t cNsResolution = SUPSemEventGetResolution(pGVM->pSession);
     788
     789    uint32_t cNsResolution = SUPSemEventGetResolution(pDevIns->Internal.s.pGVM->pSession);
    802790
    803791    LogFlow(("pdmR0DevHlp_SUPSemEventGetResolution: caller='%s'/%d: returns %u\n", pDevIns->pReg->szName, pDevIns->iInstance, cNsResolution));
    … …  
    811799    PDMDEV_ASSERT_DEVINS(pDevIns);
    812800    LogFlow(("pdmR0DevHlp_SUPSemEventMultiSignal: caller='%s'/%d: hEventMulti=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti));
    813     PGVM pGVM = pDevIns->Internal.s.pGVM;
    814     VM_ASSERT_EMT(pGVM);
    815 
    816     int rc = SUPSemEventMultiSignal(pGVM->pSession, hEventMulti);
     801
     802    int rc = SUPSemEventMultiSignal(pDevIns->Internal.s.pGVM->pSession, hEventMulti);
    817803
    818804    LogFlow(("pdmR0DevHlp_SUPSemEventMultiSignal: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    826812    PDMDEV_ASSERT_DEVINS(pDevIns);
    827813    LogFlow(("pdmR0DevHlp_SUPSemEventMultiReset: caller='%s'/%d: hEventMulti=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti));
    828     PGVM pGVM = pDevIns->Internal.s.pGVM;
    829     VM_ASSERT_EMT(pGVM);
    830 
    831     int rc = SUPSemEventMultiReset(pGVM->pSession, hEventMulti);
     814
     815    int rc = SUPSemEventMultiReset(pDevIns->Internal.s.pGVM->pSession, hEventMulti);
    832816
    833817    LogFlow(("pdmR0DevHlp_SUPSemEventMultiReset: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    843827    LogFlow(("pdmR0DevHlp_SUPSemEventMultiWaitNoResume: caller='%s'/%d: hEventMulti=%p cMillies=%RU32\n",
    844828             pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti, cMillies));
    845     PGVM pGVM = pDevIns->Internal.s.pGVM;
    846     VM_ASSERT_EMT(pGVM);
    847 
    848     int rc = SUPSemEventMultiWaitNoResume(pGVM->pSession, hEventMulti, cMillies);
     829
     830    int rc = SUPSemEventMultiWaitNoResume(pDevIns->Internal.s.pGVM->pSession, hEventMulti, cMillies);
    849831
    850832    LogFlow(("pdmR0DevHlp_SUPSemEventMultiWaitNoResume: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    860842    LogFlow(("pdmR0DevHlp_SUPSemEventMultiWaitNsAbsIntr: caller='%s'/%d: hEventMulti=%p uNsTimeout=%RU64\n",
    861843             pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti, uNsTimeout));
    862     PGVM pGVM = pDevIns->Internal.s.pGVM;
    863     VM_ASSERT_EMT(pGVM);
    864 
    865     int rc = SUPSemEventMultiWaitNsAbsIntr(pGVM->pSession, hEventMulti, uNsTimeout);
     844
     845    int rc = SUPSemEventMultiWaitNsAbsIntr(pDevIns->Internal.s.pGVM->pSession, hEventMulti, uNsTimeout);
    866846
    867847    LogFlow(("pdmR0DevHlp_SUPSemEventMultiWaitNsAbsIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    877857    LogFlow(("pdmR0DevHlp_SUPSemEventMultiWaitNsRelIntr: caller='%s'/%d: hEventMulti=%p cNsTimeout=%RU64\n",
    878858             pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti, cNsTimeout));
    879     PGVM pGVM = pDevIns->Internal.s.pGVM;
    880     VM_ASSERT_EMT(pGVM);
    881 
    882     int rc = SUPSemEventMultiWaitNsRelIntr(pGVM->pSession, hEventMulti, cNsTimeout);
     859
     860    int rc = SUPSemEventMultiWaitNsRelIntr(pDevIns->Internal.s.pGVM->pSession, hEventMulti, cNsTimeout);
    883861
    884862    LogFlow(("pdmR0DevHlp_SUPSemEventMultiWaitNsRelIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    892870    PDMDEV_ASSERT_DEVINS(pDevIns);
    893871    LogFlow(("pdmR0DevHlp_SUPSemEventMultiGetResolution: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
    894     PGVM pGVM = pDevIns->Internal.s.pGVM;
    895     VM_ASSERT_EMT(pGVM);
    896 
    897     uint32_t cNsResolution = SUPSemEventMultiGetResolution(pGVM->pSession);
     872
     873    uint32_t cNsResolution = SUPSemEventMultiGetResolution(pDevIns->Internal.s.pGVM->pSession);
    898874
    899875    LogFlow(("pdmR0DevHlp_SUPSemEventMultiGetResolution: caller='%s'/%d: returns %u\n", pDevIns->pReg->szName, pDevIns->iInstance, cNsResolution));

  • trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

    r81406 r81416  
    25552555    PDMDEV_ASSERT_DEVINS(pDevIns);
    25562556    LogFlow(("pdmR3DevHlp_TaskTrigger: caller='%s'/%d: hTask=%RU64\n", pDevIns->pReg->szName, pDevIns->iInstance, hTask));
    2557     PVM pVM = pDevIns->Internal.s.pVMR3;
    2558     VM_ASSERT_EMT(pVM);
    2559 
    2560     int rc = PDMTaskTrigger(pVM, PDMTASKTYPE_DEV, pDevIns, hTask);
     2557
     2558    int rc = PDMTaskTrigger(pDevIns->Internal.s.pVMR3, PDMTASKTYPE_DEV, pDevIns, hTask);
    25612559
    25622560    LogFlow(("pdmR3DevHlp_TaskTrigger: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    25852583    PDMDEV_ASSERT_DEVINS(pDevIns);
    25862584    LogFlow(("pdmR3DevHlp_SUPSemEventClose: caller='%s'/%d: hEvent=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEvent));
    2587     PVM pVM = pDevIns->Internal.s.pVMR3;
    2588     VM_ASSERT_EMT(pVM);
    2589 
    2590     int rc = SUPSemEventClose(pVM->pSession, hEvent);
     2585
     2586    int rc = SUPSemEventClose(pDevIns->Internal.s.pVMR3->pSession, hEvent);
    25912587
    25922588    LogFlow(("pdmR3DevHlp_SUPSemEventClose: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    26002596    PDMDEV_ASSERT_DEVINS(pDevIns);
    26012597    LogFlow(("pdmR3DevHlp_SUPSemEventSignal: caller='%s'/%d: hEvent=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEvent));
    2602     PVM pVM = pDevIns->Internal.s.pVMR3;
    2603     VM_ASSERT_EMT(pVM);
    2604 
    2605     int rc = SUPSemEventSignal(pVM->pSession, hEvent);
     2598
     2599    int rc = SUPSemEventSignal(pDevIns->Internal.s.pVMR3->pSession, hEvent);
    26062600
    26072601    LogFlow(("pdmR3DevHlp_SUPSemEventSignal: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    26162610    LogFlow(("pdmR3DevHlp_SUPSemEventWaitNoResume: caller='%s'/%d: hEvent=%p cNsTimeout=%RU32\n",
    26172611             pDevIns->pReg->szName, pDevIns->iInstance, hEvent, cMillies));
    2618     PVM pVM = pDevIns->Internal.s.pVMR3;
    2619     VM_ASSERT_EMT(pVM);
    2620 
    2621     int rc = SUPSemEventWaitNoResume(pVM->pSession, hEvent, cMillies);
     2612
     2613    int rc = SUPSemEventWaitNoResume(pDevIns->Internal.s.pVMR3->pSession, hEvent, cMillies);
    26222614
    26232615    LogFlow(("pdmR3DevHlp_SUPSemEventWaitNoResume: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    26322624    LogFlow(("pdmR3DevHlp_SUPSemEventWaitNsAbsIntr: caller='%s'/%d: hEvent=%p uNsTimeout=%RU64\n",
    26332625             pDevIns->pReg->szName, pDevIns->iInstance, hEvent, uNsTimeout));
    2634     PVM pVM = pDevIns->Internal.s.pVMR3;
    2635     VM_ASSERT_EMT(pVM);
    2636 
    2637     int rc = SUPSemEventWaitNsAbsIntr(pVM->pSession, hEvent, uNsTimeout);
     2626
     2627    int rc = SUPSemEventWaitNsAbsIntr(pDevIns->Internal.s.pVMR3->pSession, hEvent, uNsTimeout);
    26382628
    26392629    LogFlow(("pdmR3DevHlp_SUPSemEventWaitNsAbsIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    26482638    LogFlow(("pdmR3DevHlp_SUPSemEventWaitNsRelIntr: caller='%s'/%d: hEvent=%p cNsTimeout=%RU64\n",
    26492639             pDevIns->pReg->szName, pDevIns->iInstance, hEvent, cNsTimeout));
    2650     PVM pVM = pDevIns->Internal.s.pVMR3;
    2651     VM_ASSERT_EMT(pVM);
    2652 
    2653     int rc = SUPSemEventWaitNsRelIntr(pVM->pSession, hEvent, cNsTimeout);
     2640
     2641    int rc = SUPSemEventWaitNsRelIntr(pDevIns->Internal.s.pVMR3->pSession, hEvent, cNsTimeout);
    26542642
    26552643    LogFlow(("pdmR3DevHlp_SUPSemEventWaitNsRelIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    26632651    PDMDEV_ASSERT_DEVINS(pDevIns);
    26642652    LogFlow(("pdmR3DevHlp_SUPSemEventGetResolution: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
    2665     PVM pVM = pDevIns->Internal.s.pVMR3;
    2666     VM_ASSERT_EMT(pVM);
    2667 
    2668     uint32_t cNsResolution = SUPSemEventGetResolution(pVM->pSession);
     2653
     2654    uint32_t cNsResolution = SUPSemEventGetResolution(pDevIns->Internal.s.pVMR3->pSession);
    26692655
    26702656    LogFlow(("pdmR3DevHlp_SUPSemEventGetResolution: caller='%s'/%d: returns %u\n", pDevIns->pReg->szName, pDevIns->iInstance, cNsResolution));
    … …  
    26932679    PDMDEV_ASSERT_DEVINS(pDevIns);
    26942680    LogFlow(("pdmR3DevHlp_SUPSemEventMultiClose: caller='%s'/%d: hEventMulti=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti));
    2695     PVM pVM = pDevIns->Internal.s.pVMR3;
    2696     VM_ASSERT_EMT(pVM);
    2697 
    2698     int rc = SUPSemEventMultiClose(pVM->pSession, hEventMulti);
     2681
     2682    int rc = SUPSemEventMultiClose(pDevIns->Internal.s.pVMR3->pSession, hEventMulti);
    26992683
    27002684    LogFlow(("pdmR3DevHlp_SUPSemEventMultiClose: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    27082692    PDMDEV_ASSERT_DEVINS(pDevIns);
    27092693    LogFlow(("pdmR3DevHlp_SUPSemEventMultiSignal: caller='%s'/%d: hEventMulti=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti));
    2710     PVM pVM = pDevIns->Internal.s.pVMR3;
    2711     VM_ASSERT_EMT(pVM);
    2712 
    2713     int rc = SUPSemEventMultiSignal(pVM->pSession, hEventMulti);
     2694
     2695    int rc = SUPSemEventMultiSignal(pDevIns->Internal.s.pVMR3->pSession, hEventMulti);
    27142696
    27152697    LogFlow(("pdmR3DevHlp_SUPSemEventMultiSignal: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    27232705    PDMDEV_ASSERT_DEVINS(pDevIns);
    27242706    LogFlow(("pdmR3DevHlp_SUPSemEventMultiReset: caller='%s'/%d: hEventMulti=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti));
    2725     PVM pVM = pDevIns->Internal.s.pVMR3;
    2726     VM_ASSERT_EMT(pVM);
    2727 
    2728     int rc = SUPSemEventMultiReset(pVM->pSession, hEventMulti);
     2707
     2708    int rc = SUPSemEventMultiReset(pDevIns->Internal.s.pVMR3->pSession, hEventMulti);
    27292709
    27302710    LogFlow(("pdmR3DevHlp_SUPSemEventMultiReset: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    27402720    LogFlow(("pdmR3DevHlp_SUPSemEventMultiWaitNoResume: caller='%s'/%d: hEventMulti=%p cMillies=%RU32\n",
    27412721             pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti, cMillies));
    2742     PVM pVM = pDevIns->Internal.s.pVMR3;
    2743     VM_ASSERT_EMT(pVM);
    2744 
    2745     int rc = SUPSemEventMultiWaitNoResume(pVM->pSession, hEventMulti, cMillies);
     2722
     2723    int rc = SUPSemEventMultiWaitNoResume(pDevIns->Internal.s.pVMR3->pSession, hEventMulti, cMillies);
    27462724
    27472725    LogFlow(("pdmR3DevHlp_SUPSemEventMultiWaitNoResume: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    27572735    LogFlow(("pdmR3DevHlp_SUPSemEventMultiWaitNsAbsIntr: caller='%s'/%d: hEventMulti=%p uNsTimeout=%RU64\n",
    27582736             pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti, uNsTimeout));
    2759     PVM pVM = pDevIns->Internal.s.pVMR3;
    2760     VM_ASSERT_EMT(pVM);
    2761 
    2762     int rc = SUPSemEventMultiWaitNsAbsIntr(pVM->pSession, hEventMulti, uNsTimeout);
     2737
     2738    int rc = SUPSemEventMultiWaitNsAbsIntr(pDevIns->Internal.s.pVMR3->pSession, hEventMulti, uNsTimeout);
    27632739
    27642740    LogFlow(("pdmR3DevHlp_SUPSemEventMultiWaitNsAbsIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    27742750    LogFlow(("pdmR3DevHlp_SUPSemEventMultiWaitNsRelIntr: caller='%s'/%d: hEventMulti=%p cNsTimeout=%RU64\n",
    27752751             pDevIns->pReg->szName, pDevIns->iInstance, hEventMulti, cNsTimeout));
    2776     PVM pVM = pDevIns->Internal.s.pVMR3;
    2777     VM_ASSERT_EMT(pVM);
    2778 
    2779     int rc = SUPSemEventMultiWaitNsRelIntr(pVM->pSession, hEventMulti, cNsTimeout);
     2752
     2753    int rc = SUPSemEventMultiWaitNsRelIntr(pDevIns->Internal.s.pVMR3->pSession, hEventMulti, cNsTimeout);
    27802754
    27812755    LogFlow(("pdmR3DevHlp_SUPSemEventMultiWaitNsRelIntr: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    … …  
    27892763    PDMDEV_ASSERT_DEVINS(pDevIns);
    27902764    LogFlow(("pdmR3DevHlp_SUPSemEventMultiGetResolution: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
    2791     PVM pVM = pDevIns->Internal.s.pVMR3;
    2792     VM_ASSERT_EMT(pVM);
    2793 
    2794     uint32_t cNsResolution = SUPSemEventMultiGetResolution(pVM->pSession);
     2765
     2766    uint32_t cNsResolution = SUPSemEventMultiGetResolution(pDevIns->Internal.s.pVMR3->pSession);
    27952767
    27962768    LogFlow(("pdmR3DevHlp_SUPSemEventMultiGetResolution: caller='%s'/%d: returns %u\n", pDevIns->pReg->szName, pDevIns->iInstance, cNsResolution));
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