VirtualBox

Changeset 44782 in vbox for trunk/src/VBox/Devices/VMMDev


Ignore:
Timestamp:
Feb 21, 2013 1:54:41 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
83894
Message:

VMMDev.cpp: Build fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

    r44781 r44782  
    20232023 *
    20242024 * @returns VBox status code that the guest should see.
    2025  * @param   pDevIns         The VMMDev device instance.
    2026  * @param   pReqHdr         The header of the request to handle.
    2027  */
    2028 static int vmmdevReqHandler_RegisterSharedModule(PPDMDEVINS pDevIns, VMMDevRequestHeader *pReqHdr)
     2025 * @param   pThis           The VMMDev instance data.
     2026 * @param   pReqHdr         The header of the request to handle.
     2027 */
     2028static int vmmdevReqHandler_RegisterSharedModule(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr)
    20292029{
    20302030    /*
     
    20432043     * Forward the request to the VMM.
    20442044     */
    2045     return PGMR3SharedModuleRegister(PDMDevHlpGetVM(pDevIns), pReq->enmGuestOS, pReq->szName, pReq->szVersion,
     2045    return PGMR3SharedModuleRegister(PDMDevHlpGetVM(pThis->pDevIns), pReq->enmGuestOS, pReq->szName, pReq->szVersion,
    20462046                                     pReq->GCBaseAddr, pReq->cbModule, pReq->cRegions, pReq->aRegions);
    20472047}
     
    20512051 *
    20522052 * @returns VBox status code that the guest should see.
    2053  * @param   pDevIns         The VMMDev device instance.
    2054  * @param   pReqHdr         The header of the request to handle.
    2055  */
    2056 static int vmmdevReqHandler_UnregisterSharedModule(PPDMDEVINS pDevIns, VMMDevRequestHeader *pReqHdr)
     2053 * @param   pThis           The VMMDev instance data.
     2054 * @param   pReqHdr         The header of the request to handle.
     2055 */
     2056static int vmmdevReqHandler_UnregisterSharedModule(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr)
    20572057{
    20582058    /*
     
    20692069     * Forward the request to the VMM.
    20702070     */
    2071     return PGMR3SharedModuleUnregister(PDMDevHlpGetVM(pDevIns), pReq->szName, pReq->szVersion,
     2071    return PGMR3SharedModuleUnregister(PDMDevHlpGetVM(pThis->pDevIns), pReq->szName, pReq->szVersion,
    20722072                                       pReq->GCBaseAddr, pReq->cbModule);
    20732073}
     
    20772077 *
    20782078 * @returns VBox status code that the guest should see.
    2079  * @param   pDevIns         The VMMDev device instance.
    2080  * @param   pReqHdr         The header of the request to handle.
    2081  */
    2082 static int vmmdevReqHandler_CheckSharedModules(PPDMDEVINS pDevIns, VMMDevRequestHeader *pReqHdr)
     2079 * @param   pThis           The VMMDev instance data.
     2080 * @param   pReqHdr         The header of the request to handle.
     2081 */
     2082static int vmmdevReqHandler_CheckSharedModules(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr)
    20832083{
    20842084    VMMDevSharedModuleCheckRequest *pReq = (VMMDevSharedModuleCheckRequest *)pReqHdr;
    20852085    AssertMsgReturn(pReq->header.size == sizeof(VMMDevSharedModuleCheckRequest),
    20862086                    ("%u\n", pReq->header.size), VERR_INVALID_PARAMETER);
    2087     return PGMR3SharedModuleCheckAll(PDMDevHlpGetVM(pDevIns));
     2087    return PGMR3SharedModuleCheckAll(PDMDevHlpGetVM(pThis->pDevIns));
    20882088}
    20892089
     
    21132113 *
    21142114 * @returns VBox status code that the guest should see.
    2115  * @param   pDevIns         The VMMDev device instance.
    2116  * @param   pReqHdr         The header of the request to handle.
    2117  */
    2118 static int vmmdevReqHandler_DebugIsPageShared(PPDMDEVINS pDevIns, VMMDevRequestHeader *pReqHdr)
     2115 * @param   pThis           The VMMDev instance data.
     2116 * @param   pReqHdr         The header of the request to handle.
     2117 */
     2118static int vmmdevReqHandler_DebugIsPageShared(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr)
    21192119{
    21202120    VMMDevPageIsSharedRequest *pReq = (VMMDevPageIsSharedRequest *)pReqHdr;
     
    21232123
    21242124# ifdef DEBUG
    2125     return PGMR3SharedModuleGetPageState(PDMDevHlpGetVM(pDevIns), pReq->GCPtrPage, &pReq->fShared, &pReq->uPageFlags);
     2125    return PGMR3SharedModuleGetPageState(PDMDevHlpGetVM(pThis->pDevIns), pReq->GCPtrPage, &pReq->fShared, &pReq->uPageFlags);
    21262126# else
    21272127    return VERR_NOT_IMPLEMENTED;
     
    23742374#ifdef VBOX_WITH_PAGE_SHARING
    23752375        case VMMDevReq_RegisterSharedModule:
    2376             pReqHdr->rc = vmmdevReqHandler_RegisterSharedModule(pDevIns, pReqHdr);
     2376            pReqHdr->rc = vmmdevReqHandler_RegisterSharedModule(pThis, pReqHdr);
    23772377            break;
    23782378
    23792379        case VMMDevReq_UnregisterSharedModule:
    2380             pReqHdr->rc = vmmdevReqHandler_UnregisterSharedModule(pDevIns, pReqHdr);
     2380            pReqHdr->rc = vmmdevReqHandler_UnregisterSharedModule(pThis, pReqHdr);
    23812381            break;
    23822382
    23832383        case VMMDevReq_CheckSharedModules:
    2384             pReqHdr->rc = vmmdevReqHandler_CheckSharedModules(pDevIns, pReqHdr);
     2384            pReqHdr->rc = vmmdevReqHandler_CheckSharedModules(pThis, pReqHdr);
    23852385            break;
    23862386
     
    23902390
    23912391        case VMMDevReq_DebugIsPageShared:
    2392             pReqHdr->rc = vmmdevReqHandler_DebugIsPageShared(pDevIns, pReqHdr);
     2392            pReqHdr->rc = vmmdevReqHandler_DebugIsPageShared(pThis, pReqHdr);
    23932393            break;
    23942394
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