VirtualBox

Changeset 63692 in vbox


Ignore:
Timestamp:
Sep 2, 2016 12:41:41 PM (8 years ago)
Author:
vboxsync
Message:

pdmdev.h: Missed some inline wrappers when doing MMIO.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r63685 r63692  
    30983098     * @thread  EMT
    30993099     */
    3100     DECLR3CALLBACKMEMBER(void, pfnPCISetConfigCallbacks,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
     3100    DECLR3CALLBACKMEMBER(void, pfnPCISetConfigCallbacks,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev,
     3101                                                         PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
    31013102                                                         PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld));
    31023103
    … …  
    45454546 * @param   pszDesc             Pointer to description string. This must not be freed.
    45464547 */
    4547 DECLINLINE(int) PDMDevHlpMMIORegister(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t cbRange, RTHCPTR pvUser,
     4548DECLINLINE(int) PDMDevHlpMMIORegister(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTGCPHYS cbRange, RTHCPTR pvUser,
    45484549                                      uint32_t fFlags, PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, const char *pszDesc)
    45494550{
    … …  
    45674568 * @param   pszRead             Name of the RC function which is gonna handle Read operations.
    45684569 */
    4569 DECLINLINE(int) PDMDevHlpMMIORegisterRC(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t cbRange, RTRCPTR pvUser,
     4570DECLINLINE(int) PDMDevHlpMMIORegisterRC(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTGCPHYS cbRange, RTRCPTR pvUser,
    45704571                                        const char *pszWrite, const char *pszRead)
    45714572{
    … …  
    45904591 *          registered callback methods.
    45914592 */
    4592 DECLINLINE(int) PDMDevHlpMMIORegisterR0(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t cbRange, RTR0PTR pvUser,
     4593DECLINLINE(int) PDMDevHlpMMIORegisterR0(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTGCPHYS cbRange, RTR0PTR pvUser,
    45934594                                        const char *pszWrite, const char *pszRead)
    45944595{
    … …  
    45994600 * @copydoc PDMDEVHLPR3::pfnMMIORegister
    46004601 */
    4601 DECLINLINE(int) PDMDevHlpMMIORegisterEx(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t cbRange, RTHCPTR pvUser,
     4602DECLINLINE(int) PDMDevHlpMMIORegisterEx(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTGCPHYS cbRange, RTHCPTR pvUser,
    46024603                                        uint32_t fFlags, PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead,
    46034604                                        PFNIOMMMIOFILL pfnFill, const char *pszDesc)
    … …  
    46104611 * @copydoc PDMDEVHLPR3::pfnMMIORegisterRC
    46114612 */
    4612 DECLINLINE(int) PDMDevHlpMMIORegisterRCEx(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t cbRange, RTRCPTR pvUser,
     4613DECLINLINE(int) PDMDevHlpMMIORegisterRCEx(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTGCPHYS cbRange, RTRCPTR pvUser,
    46134614                                          const char *pszWrite, const char *pszRead, const char *pszFill)
    46144615{
    … …  
    46194620 * @copydoc PDMDEVHLPR3::pfnMMIORegisterR0
    46204621 */
    4621 DECLINLINE(int) PDMDevHlpMMIORegisterR0Ex(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t cbRange, RTR0PTR pvUser,
     4622DECLINLINE(int) PDMDevHlpMMIORegisterR0Ex(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTGCPHYS cbRange, RTR0PTR pvUser,
    46224623                                          const char *pszWrite, const char *pszRead, const char *pszFill)
    46234624{
    … …  
    46284629 * @copydoc PDMDEVHLPR3::pfnMMIODeregister
    46294630 */
    4630 DECLINLINE(int) PDMDevHlpMMIODeregister(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t cbRange)
     4631DECLINLINE(int) PDMDevHlpMMIODeregister(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTGCPHYS cbRange)
    46314632{
    46324633    return pDevIns->pHlpR3->pfnMMIODeregister(pDevIns, GCPhysStart, cbRange);
    … …  
    50165017 * @copydoc PDMDEVHLPR3::pfnPCISetConfigCallbacks
    50175018 */
    5018 DECLINLINE(void) PDMDevHlpPCISetConfigCallbacks(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
     5019DECLINLINE(void) PDMDevHlpPCISetConfigCallbacks(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev,
     5020                                                PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
    50195021                                                PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
    50205022{

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r63602 r63692  
    43894389        m_host.detach();
    43904390        m_vbox.detach();
     4391__debugbreak();
    43914392        m_client.detach();
    43924393

  • trunk/src/VBox/ValidationKit/testmanager/apache-template-2.4.conf

    r56295 r63692  
    2828#
    2929
    30 
    3130<LocationMatch "^/testmanager/logout.py">
    3231        AuthType Basic
    … …  
    4140        AuthUserFile ${TestManagerRootDir}/misc/htpasswd-sample
    4241        Require valid-user
     42</LocationMatch>
     43
     44<LocationMatch "^/testmanager/testboxdisp.py">
     45        Order deny,allow
     46        Require all granted
    4347</LocationMatch>
    4448

  • trunk/src/VBox/ValidationKit/testmanager/misc/htpasswd-sample

    r52776 r63692  
    11admin:ZXHvyrLs.vCmw
    22test:ClO2uu6/D7jDg
     3kosmunds:$apr1$h83FUd4z$.54hstLoWFLmrXdggrVUP.
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