Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (revision 50802) +++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (revision 50803) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2007-2013 Oracle Corporation + * Copyright (C) 2007-2014 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -360,5 +360,5 @@ */ if (pReq->hypervisorSize == 0) - Log(("vboxGuestInitFixateGuestMappings: nothing to do\n")); + LogFlowFunc(("Nothing to do\n")); else { @@ -372,5 +372,5 @@ uint32_t iTry; bool fBitched = false; - Log(("vboxGuestInitFixateGuestMappings: cbHypervisor=%#x\n", cbHypervisor)); + LogFlowFunc(("cbHypervisor=%#x\n", cbHypervisor)); for (iTry = 0; iTry < RT_ELEMENTS(ahTries); iTry++) { @@ -699,9 +699,10 @@ rc = VBoxGuestReportDriverStatus(true /* Driver is active */); if (RT_FAILURE(rc)) - Log(("VBoxGuest::VBoxGuestReinitDevExtAfterHibernation: could not report guest driver status, rc=%Rrc\n", rc)); + LogFlowFunc(("Could not report guest driver status, rc=%Rrc\n", rc)); } else - Log(("VBoxGuest::VBoxGuestReinitDevExtAfterHibernation: could not report guest information to host, rc=%Rrc\n", rc)); - Log(("VBoxGuest::VBoxGuestReinitDevExtAfterHibernation: returned with rc=%Rrc\n", rc)); + LogFlowFunc(("Could not report guest information to host, rc=%Rrc\n", rc)); + + LogFlowFunc(("Returned with rc=%Rrc\n", rc)); return rc; } @@ -806,5 +807,5 @@ else { - Log(("vboxGuestSetBalloonSize(inflate): failed, rc=%Rrc!\n", rc)); + LogFlowFunc(("Inflating failed, rc=%Rrc\n", rc)); RTR0MemObjFree(*pMemObj, true); *pMemObj = NIL_RTR0MEMOBJ; @@ -818,5 +819,5 @@ pDevExt->MemBalloon.cChunks--; else - Log(("vboxGuestSetBalloonSize(deflate): failed, rc=%Rrc!\n", rc)); + LogFlowFunc(("Deflating failed, rc=%Rrc\n", rc)); } @@ -853,6 +854,6 @@ if (RT_FAILURE(rc)) { - LogRel(("vboxGuestCloseMemBalloon: Deflate failed with rc=%Rrc. Will leak %u chunks.\n", - rc, pDevExt->MemBalloon.cChunks)); + LogRelFunc(("Deflating balloon failed with rc=%Rrc; will leak %u chunks\n", + rc, pDevExt->MemBalloon.cChunks)); break; } @@ -863,6 +864,6 @@ } else - LogRel(("vboxGuestCloseMemBalloon: Failed to allocate VMMDev request buffer (rc=%Rrc). Will leak %u chunks.\n", - rc, pDevExt->MemBalloon.cChunks)); + LogRelFunc(("Failed to allocate VMMDev request buffer, rc=%Rrc; will leak %u chunks\n", + rc, pDevExt->MemBalloon.cChunks)); RTMemFree(pDevExt->MemBalloon.paMemObj); pDevExt->MemBalloon.paMemObj = NULL; @@ -971,10 +972,10 @@ { pDevExt->pVMMDevMemory = pVMMDev; - Log(("VBoxGuestInitDevExt: VMMDevMemory: mapping=%p size=%#RX32 (%#RX32) version=%#RX32\n", - pVMMDev, pVMMDev->u32Size, cbMMIO, pVMMDev->u32Version)); + LogFlowFunc(("VMMDevMemory: mapping=%p size=%#RX32 (%#RX32), version=%#RX32\n", + pVMMDev, pVMMDev->u32Size, cbMMIO, pVMMDev->u32Version)); } else /* try live without it. */ - LogRel(("VBoxGuestInitDevExt: Bogus VMMDev memory; u32Version=%RX32 (expected %RX32) u32Size=%RX32 (expected <= %RX32)\n", - pVMMDev->u32Version, VMMDEV_MEMORY_VERSION, pVMMDev->u32Size, cbMMIO)); + LogRelFunc(("Bogus VMMDev memory; u32Version=%RX32 (expected %RX32), u32Size=%RX32 (expected <= %RX32)\n", + pVMMDev->u32Version, VMMDEV_MEMORY_VERSION, pVMMDev->u32Size, cbMMIO)); } @@ -991,5 +992,5 @@ if (RT_FAILURE(rc)) { - LogRel(("VBoxGuestInitDevExt: failed to create spinlock, rc=%Rrc!\n", rc)); + LogRelFunc(("Failed to create spinlock, rc=%Rrc\n", rc)); if (pDevExt->EventSpinlock != NIL_RTSPINLOCK) RTSpinlockDestroy(pDevExt->EventSpinlock); @@ -1000,5 +1001,5 @@ if (RT_FAILURE(rc)) { - LogRel(("VBoxGuestInitDevExt: failed to create mutex, rc=%Rrc!\n", rc)); + LogRelFunc(("Failed to create mutex, rc=%Rrc\n", rc)); RTSpinlockDestroy(pDevExt->SessionSpinlock); RTSpinlockDestroy(pDevExt->EventSpinlock); @@ -1035,23 +1036,23 @@ rc = VBoxGuestReportDriverStatus(true /* Driver is active */); if (RT_FAILURE(rc)) - LogRel(("VBoxGuestInitDevExt: VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc)); - - Log(("VBoxGuestInitDevExt: returns success\n")); + LogRelFunc(("VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc)); + + LogFlowFunc(("VBoxGuestInitDevExt: returns success\n")); return VINF_SUCCESS; } else - LogRelFunc(("failed to set host flags, rc=%Rrc\n", rc)); + LogRelFunc(("Failed to set host flags, rc=%Rrc\n", rc)); } else - LogRel(("VBoxGuestInitDevExt: VBoxReportGuestInfo failed, rc=%Rrc\n", rc)); + LogRelFunc(("VBoxGuestInitDevExt: VBoxReportGuestInfo failed, rc=%Rrc\n", rc)); VbglGRFree((VMMDevRequestHeader *)pDevExt->pIrqAckEvents); } else - LogRel(("VBoxGuestInitDevExt: VBoxGRAlloc failed, rc=%Rrc\n", rc)); + LogRelFunc(("VBoxGRAlloc failed, rc=%Rrc\n", rc)); VbglTerminate(); } else - LogRel(("VBoxGuestInitDevExt: VbglInit failed, rc=%Rrc\n", rc)); + LogRelFunc(("VbglInit failed, rc=%Rrc\n", rc)); rc2 = RTSemFastMutexDestroy(pDevExt->MemBalloon.hMtx); AssertRC(rc2); @@ -1207,6 +1208,6 @@ *ppSession = pSession; - LogFlow(("VBoxGuestCreateKernelSession: pSession=%p proc=%RTproc (%d) r0proc=%p\n", - pSession, pSession->Process, (int)pSession->Process, (uintptr_t)pSession->R0Process)); /** @todo %RTr0proc */ + LogFlowFunc(("pSession=%p proc=%RTproc (%d) r0proc=%p\n", + pSession, pSession->Process, (int)pSession->Process, (uintptr_t)pSession->R0Process)); /** @todo %RTr0proc */ return VINF_SUCCESS; } @@ -1292,5 +1293,5 @@ { if (s_cErrors++ < 32) - LogRel(("VBoxGuestWaitAlloc: out-of-memory!\n")); + LogRelFunc(("Out of memory, returning NULL\n")); return NULL; } @@ -1300,5 +1301,5 @@ { if (s_cErrors++ < 32) - LogRel(("VBoxGuestCommonIOCtl: RTSemEventMultiCreate failed with rc=%Rrc!\n", rc)); + LogRelFunc(("RTSemEventMultiCreate failed with rc=%Rrc\n", rc)); RTMemFree(pWait); return NULL; @@ -1430,6 +1431,6 @@ if (RT_FAILURE(rc)) { - Log(("VBoxGuestSetGuestCapabilities: failed to allocate %u (%#x) bytes to cache the request. rc=%Rrc!!\n", - sizeof(*pReq), sizeof(*pReq), rc)); + LogFlowFunc(("Failed to allocate %u (%#x) bytes to cache the request; rc=%Rrc\n", + sizeof(*pReq), sizeof(*pReq), rc)); return rc; } @@ -1440,5 +1441,5 @@ rc = VbglGRPerform(&pReq->header); if (RT_FAILURE(rc)) - Log(("VBoxGuestSetGuestCapabilities: VbglGRPerform failed, rc=%Rrc!\n", rc)); + LogFlowFunc(("VbglGRPerform failed, rc=%Rrc\n", rc)); VbglGRFree(&pReq->header); @@ -1459,5 +1460,5 @@ int VBoxGuestCommonIOCtlFast(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession) { - Log(("VBoxGuestCommonIOCtlFast: iFunction=%#x pDevExt=%p pSession=%p\n", iFunction, pDevExt, pSession)); + LogFlowFunc(("iFunction=%#x pDevExt=%p pSession=%p\n", iFunction, pDevExt, pSession)); NOREF(iFunction); @@ -1478,5 +1479,6 @@ static int VBoxGuestCommonIOCtl_GetVMMDevPort(PVBOXGUESTDEVEXT pDevExt, VBoxGuestPortInfo *pInfo, size_t *pcbDataReturned) { - Log(("VBoxGuestCommonIOCtl: GETVMMDEVPORT\n")); + LogFlowFuncEnter(); + pInfo->portAddress = pDevExt->IOPortBase; pInfo->pVMMDevMemory = (VMMDevMemory *)pDevExt->pVMMDevMemory; @@ -1497,5 +1499,5 @@ int VBoxGuestCommonIOCtl_SetMouseNotifyCallback(PVBOXGUESTDEVEXT pDevExt, VBoxGuestMouseSetNotifyCallback *pNotify) { - Log(("VBoxGuestCommonIOCtl: SET_MOUSE_NOTIFY_CALLBACK\n")); + LogFlowFuncEnter(); RTSpinlockAcquire(pDevExt->EventSpinlock); @@ -1525,10 +1527,11 @@ pInfo->u32Result = VBOXGUEST_WAITEVENT_OK; if (fReqEvents & ~((uint32_t)1 << iEvent)) - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns %#x\n", pInfo->u32EventFlagsOut)); + LogFlowFunc(("WAITEVENT: returns %#x\n", pInfo->u32EventFlagsOut)); else - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns %#x/%d\n", pInfo->u32EventFlagsOut, iEvent)); + LogFlowFunc(("WAITEVENT: returns %#x/%d\n", pInfo->u32EventFlagsOut, iEvent)); pSession->fPendingCancelWaitEvents = false; return VINF_SUCCESS; } + RTSpinlockReleaseNoInts(pDevExt->EventSpinlock); return VERR_TIMEOUT; @@ -1556,5 +1559,5 @@ if (RT_UNLIKELY(iEvent < 0)) { - LogRel(("VBoxGuestCommonIOCtl: WAITEVENT: Invalid input mask %#x!!\n", fReqEvents)); + LogRel(("Invalid input mask %#x\n", fReqEvents)); return VERR_INVALID_PARAMETER; } @@ -1571,5 +1574,5 @@ { pInfo->u32Result = VBOXGUEST_WAITEVENT_TIMEOUT; - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_TIMEOUT\n")); + LogFlowFunc(("Returning VERR_TIMEOUT\n")); return VERR_TIMEOUT; } @@ -1626,7 +1629,7 @@ pInfo->u32Result = VBOXGUEST_WAITEVENT_OK; if (fReqEvents & ~((uint32_t)1 << iEvent)) - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns %#x\n", pInfo->u32EventFlagsOut)); + LogFlowFunc(("Returning %#x\n", pInfo->u32EventFlagsOut)); else - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns %#x/%d\n", pInfo->u32EventFlagsOut, iEvent)); + LogFlowFunc(("Returning %#x/%d\n", pInfo->u32EventFlagsOut, iEvent)); rc = VINF_SUCCESS; } @@ -1636,10 +1639,10 @@ pInfo->u32Result = VBOXGUEST_WAITEVENT_INTERRUPTED; rc = VERR_INTERRUPTED; - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_INTERRUPTED\n")); + LogFlowFunc(("Returning VERR_INTERRUPTED\n")); } else if (rc == VERR_TIMEOUT) { pInfo->u32Result = VBOXGUEST_WAITEVENT_TIMEOUT; - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_TIMEOUT (2)\n")); + LogFlowFunc(("Returning VERR_TIMEOUT (2)\n")); } else @@ -1649,9 +1652,9 @@ static unsigned s_cErrors = 0; if (s_cErrors++ < 32) - LogRel(("VBoxGuestCommonIOCtl: WAITEVENT: returns %Rrc but no events!\n", rc)); + LogRelFunc(("Returning %Rrc but no events\n", rc)); rc = VERR_INTERNAL_ERROR; } pInfo->u32Result = VBOXGUEST_WAITEVENT_ERROR; - Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns %Rrc\n", rc)); + LogFlowFunc(("Returning %Rrc\n", rc)); } @@ -1671,5 +1674,5 @@ bool fCancelledOne = false; - Log(("VBoxGuestCommonIOCtl: CANCEL_ALL_WAITEVENTS\n")); + LogFlowFunc(("CANCEL_ALL_WAITEVENTS\n")); /* @@ -1891,16 +1894,16 @@ const uint32_t cbMinSize = vmmdevGetRequestSize(enmType); - Log(("VBoxGuestCommonIOCtl: VMMREQUEST type %d\n", pReqHdr->requestType)); + LogFlowFunc(("Type=%d\n", pReqHdr->requestType)); if (cbReq < cbMinSize) { - LogRel(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid hdr size %#x, expected >= %#x; type=%#x!!\n", - cbReq, cbMinSize, enmType)); + LogRelFunc(("Invalid hdr size %#x, expected >= %#x; type=%#x!!\n", + cbReq, cbMinSize, enmType)); return VERR_INVALID_PARAMETER; } if (cbReq > cbData) { - LogRel(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid size %#x, expected >= %#x (hdr); type=%#x!!\n", - cbData, cbReq, enmType)); + LogRelFunc(("Invalid size %#x, expected >= %#x (hdr); type=%#x!!\n", + cbData, cbReq, enmType)); return VERR_INVALID_PARAMETER; } @@ -1908,6 +1911,6 @@ if (RT_FAILURE(rc)) { - Log(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid header: size %#x, expected >= %#x (hdr); type=%#x; rc=%Rrc!!\n", - cbData, cbReq, enmType, rc)); + LogFlowFunc(("Invalid header: size %#x, expected >= %#x (hdr); type=%#x; rc=%Rrc\n", + cbData, cbReq, enmType, rc)); return rc; } @@ -1916,5 +1919,5 @@ if (RT_FAILURE(rc)) { - Log(("VBoxGuestCommonIOCtl: VMMREQUEST: Operation not allowed! type=%#x rc=%Rrc\n", enmType, rc)); + LogFlowFunc(("Operation not allowed! type=%#x, rc=%Rrc\n", enmType, rc)); return rc; } @@ -1930,6 +1933,6 @@ if (RT_FAILURE(rc)) { - Log(("VBoxGuestCommonIOCtl: VMMREQUEST: failed to allocate %u (%#x) bytes to cache the request. rc=%Rrc!!\n", - cbReq, cbReq, rc)); + LogFlowFunc(("Failed to allocate %u (%#x) bytes to cache the request; rc=%Rrc\n", + cbReq, cbReq, rc)); return rc; } @@ -1951,8 +1954,9 @@ } else if (RT_FAILURE(rc)) - Log(("VBoxGuestCommonIOCtl: VMMREQUEST: VbglGRPerform - rc=%Rrc!\n", rc)); + LogFlowFunc(("VbglGRPerform failed; rc=%Rrc\n", rc)); else { - Log(("VBoxGuestCommonIOCtl: VMMREQUEST: request execution failed; VMMDev rc=%Rrc!\n", pReqCopy->rc)); + LogFlowFunc(("Request execution failed; VMMDev rc=%Rrc\n", + pReqCopy->rc)); rc = pReqCopy->rc; } @@ -2093,5 +2097,5 @@ && ( !fInterruptible || rc != VERR_INTERRUPTED)) - LogRel(("VBoxGuestHGCMAsyncWaitCallback: wait failed! %Rrc\n", rc)); + LogRelFlow(("wait failed! %Rrc\n", rc)); VBoxGuestWaitFreeUnlocked(pDevExt, pWait); @@ -2108,5 +2112,5 @@ { PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser; - Log(("VBoxGuestHGCMAsyncWaitCallback: requestType=%d\n", pHdr->header.requestType)); + LogFlowFunc(("requestType=%d\n", pHdr->header.requestType)); return VBoxGuestHGCMAsyncWaitCallbackWorker((VMMDevHGCMRequestHeader volatile *)pHdr, pDevExt, @@ -2125,5 +2129,5 @@ { PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser; - Log(("VBoxGuestHGCMAsyncWaitCallbackInterruptible: requestType=%d\n", pHdr->header.requestType)); + LogFlowFunc(("requestType=%d\n", pHdr->header.requestType)); return VBoxGuestHGCMAsyncWaitCallbackWorker((VMMDevHGCMRequestHeader volatile *)pHdr, pDevExt, @@ -2144,13 +2148,13 @@ * to deal with cancelled requests. */ - Log(("VBoxGuestCommonIOCtl: HGCM_CONNECT: %.128s\n", - pInfo->Loc.type == VMMDevHGCMLoc_LocalHost || pInfo->Loc.type == VMMDevHGCMLoc_LocalHost_Existing - ? pInfo->Loc.u.host.achName : "")); + LogFlowFunc(("%.128s\n", + pInfo->Loc.type == VMMDevHGCMLoc_LocalHost || pInfo->Loc.type == VMMDevHGCMLoc_LocalHost_Existing + ? pInfo->Loc.u.host.achName : "")); rc = VbglR0HGCMInternalConnect(pInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT); if (RT_SUCCESS(rc)) { - Log(("VBoxGuestCommonIOCtl: HGCM_CONNECT: u32Client=%RX32 result=%Rrc (rc=%Rrc)\n", - pInfo->u32ClientID, pInfo->result, rc)); + LogFlowFunc(("u32Client=%RX32 result=%Rrc (rc=%Rrc)\n", + pInfo->u32ClientID, pInfo->result, rc)); if (RT_SUCCESS(pInfo->result)) { @@ -2174,5 +2178,5 @@ if (s_cErrors++ < 32) - LogRel(("VBoxGuestCommonIOCtl: HGCM_CONNECT: too many HGCMConnect calls for one session!\n")); + LogRelFunc(("Too many HGCMConnect calls for one session\n")); Info.result = 0; @@ -2210,5 +2214,5 @@ static unsigned s_cErrors = 0; if (s_cErrors++ > 32) - LogRel(("VBoxGuestCommonIOCtl: HGCM_DISCONNECT: u32Client=%RX32\n", u32ClientId)); + LogRelFunc(("u32Client=%RX32\n", u32ClientId)); return VERR_INVALID_HANDLE; } @@ -2219,9 +2223,9 @@ * to deal with cancelled requests. */ - Log(("VBoxGuestCommonIOCtl: HGCM_DISCONNECT: u32Client=%RX32\n", pInfo->u32ClientID)); + LogFlowFunc(("u32Client=%RX32\n", pInfo->u32ClientID)); rc = VbglR0HGCMInternalDisconnect(pInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT); if (RT_SUCCESS(rc)) { - Log(("VBoxGuestCommonIOCtl: HGCM_DISCONNECT: result=%Rrc\n", pInfo->result)); + LogFlowFunc(("Disconnected with rc=%Rrc\n", pInfo->result)); /** int32_t vs. int! */ if (pcbDataReturned) *pcbDataReturned = sizeof(*pInfo); @@ -2255,5 +2259,5 @@ if (pInfo->cParms > 4096) /* (Just make sure it doesn't overflow the next check.) */ { - LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: cParm=%RX32 is not sane\n", pInfo->cParms)); + LogRelFunc(("cParm=%RX32 is not sane\n", pInfo->cParms)); return VERR_INVALID_PARAMETER; } @@ -2268,6 +2272,6 @@ if (cbData < cbActual) { - LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: cbData=%#zx (%zu) required size is %#zx (%zu)\n", - cbData, cbData, cbActual, cbActual)); + LogRelFunc(("cbData=%#zx (%zu) required size is %#zx (%zu)\n", + cbData, cbData, cbActual, cbActual)); return VERR_INVALID_PARAMETER; } @@ -2285,5 +2289,5 @@ static unsigned s_cErrors = 0; if (s_cErrors++ > 32) - LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: Invalid handle. u32Client=%RX32\n", u32ClientId)); + LogRelFunc(("Invalid handle; u32Client=%RX32\n", u32ClientId)); return VERR_INVALID_HANDLE; } @@ -2295,5 +2299,5 @@ * be interruptible (should add a flag for this later I guess). */ - Log(("VBoxGuestCommonIOCtl: HGCM_CALL: u32Client=%RX32\n", pInfo->u32ClientID)); + LogFlowFunc(("u32Client=%RX32\n", pInfo->u32ClientID)); fFlags = !fUserData && pSession->R0Process == NIL_RTR0PROCESS ? VBGLR0_HGCMCALL_F_KERNEL : VBGLR0_HGCMCALL_F_USER; #ifdef RT_ARCH_AMD64 @@ -2315,5 +2319,5 @@ if (RT_SUCCESS(rc)) { - Log(("VBoxGuestCommonIOCtl: HGCM_CALL: result=%Rrc\n", pInfo->result)); + LogFlowFunc(("Result rc=%Rrc\n", pInfo->result)); /** int32_t vs. int! */ if (pcbDataReturned) *pcbDataReturned = cbActual; @@ -2326,14 +2330,15 @@ static unsigned s_cErrors = 0; if (s_cErrors++ < 32) - LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: %s Failed. rc=%Rrc.\n", f32bit ? "32" : "64", rc)); + LogRelFunc(("%s-bit call failed; rc=%Rrc\n", + f32bit ? "32" : "64", rc)); } else - Log(("VBoxGuestCommonIOCtl: HGCM_CALL: %s Failed. rc=%Rrc.\n", f32bit ? "32" : "64", rc)); + LogFlowFunc(("%s-bit call failed; rc=%Rrc\n", + f32bit ? "32" : "64", rc)); } return rc; } - - #endif /* VBOX_WITH_HGCM */ + /** @@ -2355,9 +2360,7 @@ VBoxGuestCheckBalloonInfo *pInfo, size_t *pcbDataReturned) { - VMMDevGetMemBalloonChangeRequest *pReq; - int rc; - - Log(("VBoxGuestCommonIOCtl: CHECK_MEMORY_BALLOON\n")); - rc = RTSemFastMutexRequest(pDevExt->MemBalloon.hMtx); + LogFlowFuncEnter(); + + int rc = RTSemFastMutexRequest(pDevExt->MemBalloon.hMtx); AssertRCReturn(rc, rc); @@ -2368,9 +2371,13 @@ if ( pDevExt->MemBalloon.pOwner != pSession && pDevExt->MemBalloon.pOwner == NULL) + { pDevExt->MemBalloon.pOwner = pSession; + } if (pDevExt->MemBalloon.pOwner == pSession) { - rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevGetMemBalloonChangeRequest), VMMDevReq_GetMemBalloonChangeRequest); + VMMDevGetMemBalloonChangeRequest *pReq; + rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevGetMemBalloonChangeRequest), + VMMDevReq_GetMemBalloonChangeRequest); if (RT_SUCCESS(rc)) { @@ -2401,5 +2408,5 @@ } else - LogRel(("VBoxGuestCommonIOCtl: CHECK_MEMORY_BALLOON: VbglGRPerform failed. rc=%Rrc\n", rc)); + LogRelFunc(("VbglGRPerform failed; rc=%Rrc\n", rc)); VbglGRFree(&pReq->header); } @@ -2409,5 +2416,6 @@ RTSemFastMutexRelease(pDevExt->MemBalloon.hMtx); - Log(("VBoxGuestCommonIOCtl: CHECK_MEMORY_BALLOON returns %Rrc\n", rc)); + + LogFlowFunc(("Returns %Rrc\n", rc)); return rc; } @@ -2443,5 +2451,6 @@ if (pDevExt->MemBalloon.pOwner == pSession) { - rc = vboxGuestSetBalloonSizeFromUser(pDevExt, pSession, pInfo->u64ChunkAddr, !!pInfo->fInflate); + rc = vboxGuestSetBalloonSizeFromUser(pDevExt, pSession, pInfo->u64ChunkAddr, + !!pInfo->fInflate); if (pcbDataReturned) *pcbDataReturned = 0; @@ -2469,9 +2478,10 @@ { VMMDevReqWriteCoreDump *pReq = NULL; - int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_WriteCoreDump); + int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevReqWriteCoreDump), + VMMDevReq_WriteCoreDump); if (RT_FAILURE(rc)) { - Log(("VBoxGuestCommonIOCtl: WRITE_CORE_DUMP: failed to allocate %u (%#x) bytes to cache the request. rc=%Rrc!!\n", - sizeof(*pReq), sizeof(*pReq), rc)); + LogFlowFunc(("Failed to allocate %u (%#x) bytes to cache the request; rc=%Rrc\n", + sizeof(VMMDevReqWriteCoreDump), sizeof(VMMDevReqWriteCoreDump), rc)); return rc; } @@ -2480,5 +2490,5 @@ rc = VbglGRPerform(&pReq->header); if (RT_FAILURE(rc)) - Log(("VBoxGuestCommonIOCtl: WRITE_CORE_DUMP: VbglGRPerform failed, rc=%Rrc!\n", rc)); + LogFlowFunc(("VbglGRPerform failed, rc=%Rrc\n", rc)); VbglGRFree(&pReq->header); @@ -2609,6 +2619,6 @@ if (!VBoxGuestCommonGuestCapsValidateValues(fOrMask)) { - LogRel(("VBoxGuestCommonGuestCapsAcquire: pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- invalid fOrMask\n", - pSession, fOrMask, fNotMask, enmFlags)); + LogRelFunc(("pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- invalid fOrMask\n", + pSession, fOrMask, fNotMask, enmFlags)); return VERR_INVALID_PARAMETER; } @@ -2617,6 +2627,6 @@ && enmFlags != VBOXGUESTCAPSACQUIRE_FLAGS_NONE) { - LogRel(("VBoxGuestCommonGuestCapsAcquire: pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- invalid enmFlags %d\n", - pSession, fOrMask, fNotMask, enmFlags)); + LogRelFunc(("pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- invalid enmFlags %d\n", + pSession, fOrMask, fNotMask, enmFlags)); return VERR_INVALID_PARAMETER; } @@ -2624,6 +2634,6 @@ if (!VBoxGuestCommonGuestCapsModeSet(pDevExt, fOrMask, true, &fSetCaps)) { - LogRel(("VBoxGuestCommonGuestCapsAcquire: pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- calling caps acquire for set caps\n", - pSession, fOrMask, fNotMask, enmFlags)); + LogRelFunc(("pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- calling caps acquire for set caps\n", + pSession, fOrMask, fNotMask, enmFlags)); return VERR_INVALID_STATE; } @@ -2631,6 +2641,6 @@ if (enmFlags & VBOXGUESTCAPSACQUIRE_FLAGS_CONFIG_ACQUIRE_MODE) { - Log(("VBoxGuestCommonGuestCapsAcquire: pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- configured acquire caps: 0x%x\n", - pSession, fOrMask, fNotMask, enmFlags)); + LogRelFunc(("pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x) -- configured acquire caps: 0x%x\n", + pSession, fOrMask, fNotMask, enmFlags)); return VINF_SUCCESS; } @@ -2672,5 +2682,5 @@ if (fOtherConflictingCaps) { - Log(("VBoxGuest: Caps 0x%x were busy\n", fOtherConflictingCaps)); + LogFlowFunc(("Caps 0x%x were busy\n", fOtherConflictingCaps)); return VERR_RESOURCE_BUSY; } @@ -2686,5 +2696,5 @@ if (RT_FAILURE(rc)) { - LogRel(("VBoxGuestCommonGuestCapsAcquire: VBoxGuestSetGuestCapabilities failed, rc=%Rrc\n", rc)); + LogRelFunc(("VBoxGuestSetGuestCapabilities failed, rc=%Rrc\n", rc)); /* Failure branch @@ -2717,5 +2727,5 @@ int rc = VBoxGuestCommonGuestCapsAcquire(pDevExt, pSession, pAcquire->u32OrMask, pAcquire->u32NotMask, pAcquire->enmFlags); if (RT_FAILURE(rc)) - LogRel(("VBoxGuestCommonGuestCapsAcquire: failed rc=%Rrc\n", rc)); + LogRelFunc(("Failed, rc=%Rrc\n", rc)); pAcquire->rc = rc; return VINF_SUCCESS; @@ -2742,6 +2752,6 @@ { int rc; - Log(("VBoxGuestCommonIOCtl: iFunction=%#x pDevExt=%p pSession=%p pvData=%p cbData=%zu\n", - iFunction, pDevExt, pSession, pvData, cbData)); + LogFlowFunc(("iFunction=%#x, pDevExt=%p, pSession=%p, pvData=%p, cbData=%zu\n", + iFunction, pDevExt, pSession, pvData, cbData)); /* @@ -2963,6 +2973,6 @@ default: { - LogRel(("VBoxGuestCommonIOCtl: Unknown request iFunction=%#x stripped size=%#x\n", - iFunction, VBOXGUEST_IOCTL_STRIP_SIZE(iFunction))); + LogRelFunc(("Unknown request iFunction=%#x, stripped size=%#x\n", + iFunction, VBOXGUEST_IOCTL_STRIP_SIZE(iFunction))); rc = VERR_NOT_SUPPORTED; break; @@ -2971,5 +2981,5 @@ } - Log(("VBoxGuestCommonIOCtl: returns %Rrc *pcbDataReturned=%zu\n", rc, pcbDataReturned ? *pcbDataReturned : 0)); + LogFlowFunc(("Returning %Rrc *pcbDataReturned=%zu\n", rc, pcbDataReturned ? *pcbDataReturned : 0)); return rc; } @@ -3020,5 +3030,5 @@ PVBOXGUESTWAIT pSafe; - Log3(("VBoxGuestCommonISR: acknowledge events succeeded %#RX32\n", fEvents)); + LogFlowFunc(("Acknowledge events succeeded: %#RX32\n", fEvents)); /* @@ -3086,9 +3096,11 @@ } else /* something is serious wrong... */ - Log(("VBoxGuestCommonISR: acknowledge events failed rc=%Rrc (events=%#x)!!\n", - pReq->header.rc, pReq->events)); - } + LogFlowFunc(("Acknowledging events failed, rc=%Rrc (events=%#x)\n", + pReq->header.rc, pReq->events)); + } +#ifndef DEBUG_andy else - LogFlow(("VBoxGuestCommonISR: not ours\n")); + LogFlowFunc(("Not ours\n")); +#endif RTSpinlockReleaseNoInts(pDevExt->EventSpinlock);