Index: /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk (revision 50821) +++ /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk (revision 50822) @@ -38,5 +38,5 @@ VBoxGuest_DEFS.linux = KBUILD_MODNAME=KBUILD_STR\(vboxguest\) KBUILD_BASENAME=KBUILD_STR\(vboxguest\) DEBUG_HASH=2 DEBUG_HASH2=3 EXPORT_SYMTAB VBoxGuest_DEFS.solaris = VBOX_SVN_REV=$(VBOX_SVN_REV) - VBoxGuest_DEFS.win = # VBOX_WITH_VRDP_SESSION_HANDLING + VBoxGuest_DEFS.win = VBOX_GUESTDRV_WITH_RELEASE_LOGGER # VBOX_WITH_VRDP_SESSION_HANDLING VBoxGuest_DEFS.darwin = VBOX_GUESTDRV_WITH_RELEASE_LOGGER ifeq ($(KBUILD_TYPE),release) Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (revision 50821) +++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (revision 50822) @@ -98,5 +98,5 @@ NTSTATUS rc = STATUS_SUCCESS; - Log(("VBoxGuest::DriverEntry. Driver built: %s %s\n", __DATE__, __TIME__)); + LogFunc(("Driver built: %s %s\n", __DATE__, __TIME__)); /* @@ -108,7 +108,7 @@ ULONG ulBuildNo; BOOLEAN fCheckedBuild = PsGetVersion(&ulMajorVer, &ulMinorVer, &ulBuildNo, NULL); - Log(("VBoxGuest::DriverEntry: Running on Windows NT version %u.%u, build %u\n", ulMajorVer, ulMinorVer, ulBuildNo)); + LogRelFunc(("Running on Windows NT version %u.%u, build %u\n", ulMajorVer, ulMinorVer, ulBuildNo)); if (fCheckedBuild) - Log(("VBoxGuest::DriverEntry: Running on a Windows checked build (debug)!\n")); + LogRelFunc(("Running on a Windows checked build (debug)!\n")); #ifdef DEBUG vbgdNtDoTests(); @@ -132,5 +132,5 @@ break; default: - Log(("VBoxGuest::DriverEntry: Unknown version of Windows (%u.%u), refusing!\n", ulMajorVer, ulMinorVer)); + LogRelFunc(("Unknown version of Windows (%u.%u), refusing!\n", ulMajorVer, ulMinorVer)); rc = STATUS_DRIVER_UNABLE_TO_LOAD; break; @@ -150,5 +150,5 @@ break; default: - Log(("VBoxGuest::DriverEntry: Unknown version of Windows (%u.%u), refusing!\n", ulMajorVer, ulMinorVer)); + LogRelFunc(("Unknown version of Windows (%u.%u), refusing!\n", ulMajorVer, ulMinorVer)); rc = STATUS_DRIVER_UNABLE_TO_LOAD; } @@ -159,7 +159,7 @@ default: if (ulMajorVer < 4) - Log(("VBoxGuest::DriverEntry: At least Windows NT4 required! (%u.%u)\n", ulMajorVer, ulMinorVer)); + LogRelFunc(("At least Windows NT4 required! (%u.%u)\n", ulMajorVer, ulMinorVer)); else - Log(("VBoxGuest::DriverEntry: Too new version %u.%u!\n", ulMajorVer, ulMinorVer)); + LogRelFunc(("Too new version %u.%u!\n", ulMajorVer, ulMinorVer)); rc = STATUS_DRIVER_UNABLE_TO_LOAD; break; @@ -189,5 +189,5 @@ } - Log(("VBoxGuest::DriverEntry returning %#x\n", rc)); + LogFlowFunc(("Returning %#x\n", rc)); return rc; } @@ -205,5 +205,5 @@ { NTSTATUS rc; - Log(("VBoxGuest::vbgdNtGuestAddDevice\n")); + LogFlowFuncEnter(); /* @@ -253,5 +253,5 @@ /* Driver is ready now. */ pDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - Log(("VBoxGuest::vbgdNtGuestAddDevice: returning with rc = 0x%x (success)\n", rc)); + LogFlowFunc(("Returning with rc=0x%x (success)\n", rc)); return rc; } @@ -261,5 +261,5 @@ else { - Log(("VBoxGuest::vbgdNtGuestAddDevice: IoAttachDeviceToDeviceStack did not give a nextLowerDriver!\n")); + LogFlowFunc(("IoAttachDeviceToDeviceStack did not give a nextLowerDriver!\n")); rc = STATUS_DEVICE_NOT_CONNECTED; } @@ -269,10 +269,11 @@ } else - Log(("VBoxGuest::vbgdNtGuestAddDevice: IoCreateSymbolicLink failed with rc=%#x!\n", rc)); + LogFlowFunc(("IoCreateSymbolicLink failed with rc=%#x!\n", rc)); IoDeleteDevice(pDeviceObject); } else - Log(("VBoxGuest::vbgdNtGuestAddDevice: IoCreateDevice failed with rc=%#x!\n", rc)); - Log(("VBoxGuest::vbgdNtGuestAddDevice: returning with rc = 0x%x\n", rc)); + LogFlowFunc(("IoCreateDevice failed with rc=%#x!\n", rc)); + + LogFlowFunc(("Returning with rc=0x%x\n", rc)); return rc; } @@ -308,6 +309,6 @@ }; - Log(("VBoxGuest::vbgdNtShowDeviceResources: Type %s", - uType < RT_ELEMENTS(s_apszName) ? s_apszName[uType] : "Unknown")); + LogFlowFunc(("Type=%s", + uType < RT_ELEMENTS(s_apszName) ? s_apszName[uType] : "Unknown")); switch (uType) @@ -315,22 +316,22 @@ case CmResourceTypePort: case CmResourceTypeMemory: - Log(("VBoxGuest::vbgdNtShowDeviceResources: Start %8X%8.8lX length %X\n", - pResource->u.Port.Start.HighPart, pResource->u.Port.Start.LowPart, - pResource->u.Port.Length)); + LogFlowFunc(("Start %8X%8.8lX, length=%X\n", + pResource->u.Port.Start.HighPart, pResource->u.Port.Start.LowPart, + pResource->u.Port.Length)); break; case CmResourceTypeInterrupt: - Log(("VBoxGuest::vbgdNtShowDeviceResources: Level %X, Vector %X, Affinity %X\n", - pResource->u.Interrupt.Level, pResource->u.Interrupt.Vector, - pResource->u.Interrupt.Affinity)); + LogFlowFunc(("Level=%X, vector=%X, affinity=%X\n", + pResource->u.Interrupt.Level, pResource->u.Interrupt.Vector, + pResource->u.Interrupt.Affinity)); break; case CmResourceTypeDma: - Log(("VBoxGuest::vbgdNtShowDeviceResources: Channel %d, Port %X\n", - pResource->u.Dma.Channel, pResource->u.Dma.Port)); + LogFlowFunc(("Channel %d, Port %X\n", + pResource->u.Dma.Channel, pResource->u.Dma.Port)); break; default: - Log(("\n")); + LogFlowFunc(("\n")); break; } @@ -357,5 +358,5 @@ #endif - Log(("VBoxGuest::vbgdNtInit\n")); + LogFlowFuncEnter(); int rc = STATUS_SUCCESS; @@ -364,5 +365,5 @@ * Let's have a look at what our PCI adapter offers. */ - Log(("VBoxGuest::vbgdNtInit: Starting to scan PCI resources of VBoxGuest ...\n")); + LogFlowFunc(("Starting to scan PCI resources of VBoxGuest ...\n")); /* Assign the PCI resources. */ @@ -401,6 +402,6 @@ pDevExt->Core.pVMMDevMemory = (VMMDevMemory *)pvMMIOBase; - Log(("VBoxGuest::vbgdNtInit: pvMMIOBase = 0x%p, pDevExt = 0x%p, pDevExt->Core.pVMMDevMemory = 0x%p\n", - pvMMIOBase, pDevExt, pDevExt ? pDevExt->Core.pVMMDevMemory : NULL)); + LogFlowFunc(("pvMMIOBase=0x%p, pDevExt=0x%p, pDevExt->Core.pVMMDevMemory=0x%p\n", + pvMMIOBase, pDevExt, pDevExt ? pDevExt->Core.pVMMDevMemory : NULL)); int vrc = VBoxGuestInitDevExt(&pDevExt->Core, @@ -411,10 +412,10 @@ if (RT_FAILURE(vrc)) { - Log(("VBoxGuest::vbgdNtInit: Could not init device extension, rc = %Rrc!\n", vrc)); + LogFlowFunc(("Could not init device extension, rc=%Rrc\n", vrc)); rc = STATUS_DEVICE_CONFIGURATION_ERROR; } } else - Log(("VBoxGuest::vbgdNtInit: Could not map physical address of VMMDev, rc = 0x%x!\n", rc)); + LogFlowFunc(("Could not map physical address of VMMDev, rc=0x%x\n", rc)); } @@ -425,5 +426,5 @@ if (RT_FAILURE(vrc)) { - Log(("VBoxGuest::vbgdNtInit: Alloc for pPowerStateRequest failed, rc = %Rrc\n", vrc)); + LogFlowFunc(("Alloc for pPowerStateRequest failed, rc=%Rrc\n", vrc)); rc = STATUS_UNSUCCESSFUL; } @@ -435,5 +436,5 @@ * Register DPC and ISR. */ - Log(("VBoxGuest::vbgdNtInit: Initializing DPC/ISR ...\n")); + LogFlowFunc(("Initializing DPC/ISR ...\n")); IoInitializeDpcRequest(pDevExt->pDeviceObject, vbgdNtDpcHandler); @@ -446,6 +447,6 @@ || pDevExt->interruptVector) { - Log(("VBoxGuest::vbgdNtInit: Getting interrupt vector (HAL): Bus: %u, IRQL: %u, Vector: %u\n", - pDevExt->busNumber, pDevExt->interruptLevel, pDevExt->interruptVector)); + LogFlowFunc(("Getting interrupt vector (HAL): Bus=%u, IRQL=%u, Vector=%u\n", + pDevExt->busNumber, pDevExt->interruptLevel, pDevExt->interruptVector)); uInterruptVector = HalGetInterruptVector(PCIBus, @@ -455,14 +456,14 @@ &irqLevel, &pDevExt->interruptAffinity); - Log(("VBoxGuest::vbgdNtInit: HalGetInterruptVector returns vector %u\n", uInterruptVector)); + LogFlowFunc(("HalGetInterruptVector returns vector=%u\n", uInterruptVector)); if (uInterruptVector == 0) - Log(("VBoxGuest::vbgdNtInit: No interrupt vector found!\n")); + LogFunc(("No interrupt vector found!\n")); } else - Log(("VBoxGuest::vbgdNtInit: Device does not provide an interrupt!\n")); + LogFlowFunc(("Device does not provide an interrupt!\n")); #endif if (pDevExt->interruptVector) { - Log(("VBoxGuest::vbgdNtInit: Connecting interrupt ...\n")); + LogFlowFunc(("Connecting interrupt ...\n")); rc = IoConnectInterrupt(&pDevExt->pInterruptObject, /* Out: interrupt object. */ @@ -484,17 +485,17 @@ FALSE); /* Don't save FPU stack. */ if (NT_ERROR(rc)) - Log(("VBoxGuest::vbgdNtInit: Could not connect interrupt, rc = 0x%x\n", rc)); + LogFlowFunc(("Could not connect interrupt, rc=0x%x\n", rc)); } else - Log(("VBoxGuest::vbgdNtInit: No interrupt vector found!\n")); + LogFlowFunc(("No interrupt vector found!\n")); } #ifdef VBOX_WITH_HGCM - Log(("VBoxGuest::vbgdNtInit: Allocating kernel session data ...\n")); + LogFunc(("Allocating kernel session data ...\n")); int vrc = VBoxGuestCreateKernelSession(&pDevExt->Core, &pDevExt->pKernelSession); if (RT_FAILURE(vrc)) { - Log(("VBoxGuest::vbgdNtInit: Failed to allocated kernel session data! rc = %Rrc\n", rc)); + LogFlowFunc(("Failed to allocated kernel session data, rc=%Rrc\n", rc)); rc = STATUS_UNSUCCESSFUL; } @@ -504,14 +505,15 @@ { ULONG ulValue = 0; - NTSTATUS rcNt = vbgdNtRegistryReadDWORD(RTL_REGISTRY_SERVICES, L"VBoxGuest", L"LoggingEnabled", &ulValue); + NTSTATUS rcNt = vbgdNtRegistryReadDWORD(RTL_REGISTRY_SERVICES, + L"VBoxGuest", L"LoggingEnabled", &ulValue); if (NT_SUCCESS(rcNt)) { pDevExt->Core.fLoggingEnabled = ulValue >= 0xFF; if (pDevExt->Core.fLoggingEnabled) - Log(("Logging to release log enabled (0x%x)", ulValue)); + LogRelFunc(("Logging to host log enabled (0x%x)", ulValue)); } /* Ready to rumble! */ - Log(("VBoxGuest::vbgdNtInit: Device is ready!\n")); + LogRelFunc(("Device is ready!\n")); VBOXGUEST_UPDATE_DEVSTATE(pDevExt, WORKING); } @@ -522,5 +524,5 @@ * whole bunch of things... */ - Log(("VBoxGuest::vbgdNtInit: Returned with rc = 0x%x\n", rc)); + LogFlowFunc(("Returned with rc=0x%x\n", rc)); return rc; } @@ -535,5 +537,5 @@ NTSTATUS vbgdNtCleanup(PDEVICE_OBJECT pDevObj) { - Log(("VBoxGuest::vbgdNtCleanup\n")); + LogFlowFuncEnter(); PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pDevObj->DeviceExtension; @@ -566,4 +568,5 @@ vbgdNtUnmapVMMDevMemory(pDevExt); } + return STATUS_SUCCESS; } @@ -577,5 +580,6 @@ static void vbgdNtUnload(PDRIVER_OBJECT pDrvObj) { - Log(("VBoxGuest::vbgdNtGuestUnload\n")); + LogFlowFuncEnter(); + #ifdef TARGET_NT4 vbgdNtCleanup(pDrvObj->DeviceObject); @@ -600,5 +604,5 @@ #endif /* !TARGET_NT4 */ - Log(("VBoxGuest::vbgdNtGuestUnload: returning\n")); + LogFlowFunc(("Returning\n")); } @@ -621,5 +625,5 @@ if (pDevExt->devState != WORKING) { - Log(("VBoxGuest::vbgdNtGuestCreate: device is not working currently: %d!\n", pDevExt->devState)); + LogFlowFunc(("Device is not working currently, state=%d\n", pDevExt->devState)); rc = STATUS_UNSUCCESSFUL; } @@ -630,5 +634,5 @@ * (But this is possible.) */ - Log(("VBoxGuest::vbgdNtGuestCreate: Uhm, we're not a directory!\n")); + LogFlowFunc(("Uhm, we're not a directory!\n")); rc = STATUS_NOT_A_DIRECTORY; } @@ -638,6 +642,5 @@ if (pFileObj) { - Log(("VBoxGuest::vbgdNtGuestCreate: File object type = %d\n", - pFileObj->Type)); + LogFlowFunc(("File object type=%d\n", pFileObj->Type)); int vrc; @@ -667,5 +670,5 @@ IoCompleteRequest(pIrp, IO_NO_INCREMENT); - Log(("VBoxGuest::vbgdNtGuestCreate: Returning 0x%x\n", rc)); + LogFlowFunc(("Returning rc=0x%x\n", rc)); return rc; } @@ -684,6 +687,6 @@ PFILE_OBJECT pFileObj = pStack->FileObject; - Log(("VBoxGuest::vbgdNtGuestClose: pDevExt=0x%p pFileObj=0x%p FsContext=0x%p\n", - pDevExt, pFileObj, pFileObj->FsContext)); + LogFlowFunc(("pDevExt=0x%p, pFileObj=0x%p, FsContext=0x%p\n", + pDevExt, pFileObj, pFileObj->FsContext)); #ifdef VBOX_WITH_HGCM @@ -726,6 +729,6 @@ pSession = (PVBOXGUESTSESSION)pFileObj->FsContext; - Log(("VBoxGuest::vbgdNtIOCtl: uCmd=%u, pDevExt=0x%p, pSession=0x%p\n", - uCmd, pDevExt, pSession)); + LogFlowFunc(("uCmd=%u, pDevExt=0x%p, pSession=0x%p\n", + uCmd, pDevExt, pSession)); /* We don't have a session associated with the file object? So this seems @@ -735,5 +738,5 @@ if (pSession == NULL) { - Log(("VBoxGuest::vbgdNtIOCtl: Using kernel session data ...\n")); + LogFlowFunc(("Using kernel session data ...\n")); pSession = pDevExt->pKernelSession; } @@ -749,6 +752,6 @@ case VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION: { - LogRel(("VBoxGuest::vbgdNtIOCtl: ENABLE_VRDP_SESSION: Currently: %sabled\n", - pDevExt->fVRDPEnabled? "en": "dis")); + LogRelFunc(("ENABLE_VRDP_SESSION: Currently: %sabled\n", + pDevExt->fVRDPEnabled? "en": "dis")); if (!pDevExt->fVRDPEnabled) { @@ -756,6 +759,6 @@ pDevExt->fVRDPEnabled = true; - LogRel(("VBoxGuest::vbgdNtIOCtl: ENABLE_VRDP_SESSION: Current active console ID: 0x%08X\n", - pSharedUserData->ActiveConsoleId)); + LogRelFunc(("ENABLE_VRDP_SESSION: Current active console ID: 0x%08X\n", + pSharedUserData->ActiveConsoleId)); pDevExt->ulOldActiveConsoleId = pSharedUserData->ActiveConsoleId; pSharedUserData->ActiveConsoleId = 2; @@ -766,6 +769,6 @@ case VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION: { - LogRel(("VBoxGuest::vbgdNtIOCtl: DISABLE_VRDP_SESSION: Currently: %sabled\n", - pDevExt->fVRDPEnabled? "en": "dis")); + LogRelFunc(("DISABLE_VRDP_SESSION: Currently: %sabled\n", + pDevExt->fVRDPEnabled? "en": "dis")); if (pDevExt->fVRDPEnabled) { @@ -773,6 +776,6 @@ pDevExt->fVRDPEnabled = false; - Log(("VBoxGuest::vbgdNtIOCtl: DISABLE_VRDP_SESSION: Current active console ID: 0x%08X\n", - pSharedUserData->ActiveConsoleId)); + LogFlowFunc(("DISABLE_VRDP_SESSION: Current active console ID: 0x%08X\n", + pSharedUserData->ActiveConsoleId)); pSharedUserData->ActiveConsoleId = pDevExt->ulOldActiveConsoleId; pDevExt->ulOldActiveConsoleId = 0; @@ -792,6 +795,6 @@ int vrc = VBoxGuestCommonIOCtl(uCmd, &pDevExt->Core, pSession, pBuf, cbData, &cbDataReturned); - Log(("VBoxGuest::vbgdNtGuestDeviceControl: rc=%Rrc, pBuf=0x%p, cbData=%u, cbDataReturned=%u\n", - vrc, pBuf, cbData, cbDataReturned)); + LogFlowFunc(("rc=%Rrc, pBuf=0x%p, cbData=%u, cbDataReturned=%u\n", + vrc, pBuf, cbData, cbDataReturned)); if (RT_SUCCESS(vrc)) @@ -799,5 +802,5 @@ if (RT_UNLIKELY(cbDataReturned > cbData)) { - Log(("VBoxGuest::vbgdNtGuestDeviceControl: Too much output data %u - expected %u!\n", cbDataReturned, cbData)); + LogFlowFunc(("Too much output data %u - expected %u!\n", cbDataReturned, cbData)); cbDataReturned = cbData; Status = STATUS_BUFFER_TOO_SMALL; @@ -825,5 +828,5 @@ IoCompleteRequest(pIrp, IO_NO_INCREMENT); - //Log(("VBoxGuest::vbgdNtGuestDeviceControl: returned cbOut=%d rc=%#x\n", cbOut, Status)); + //LogFlowFunc(("Returned cbOut=%d rc=%#x\n", cbOut, Status)); return Status; } @@ -904,5 +907,5 @@ PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pDevObj->DeviceExtension; - Log(("VBoxGuest::vbgdNtGuestSystemControl\n")); + LogFlowFuncEnter(); /* Always pass it on to the next driver. */ @@ -924,5 +927,5 @@ PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pDevObj->DeviceExtension; - Log(("VBoxGuest::vbgdNtGuestShutdown\n")); + LogFlowFuncEnter(); VMMDevPowerStateRequest *pReq = pDevExt->pPowerStateRequest; @@ -934,9 +937,7 @@ int rc = VbglGRPerform(&pReq->header); if (RT_FAILURE(rc)) - { - Log(("VBoxGuest::vbgdNtGuestShutdown: Error performing request to VMMDev! " - "rc = %Rrc\n", rc)); - } - } + LogFlowFunc(("Error performing request to VMMDev, rc=%Rrc\n", rc)); + } + return STATUS_SUCCESS; } @@ -952,5 +953,5 @@ NTSTATUS vbgdNtNotSupportedStub(PDEVICE_OBJECT pDevObj, PIRP pIrp) { - Log(("VBoxGuest::vbgdNtGuestNotSupportedStub\n")); + LogFlowFuncEnter(); pIrp->IoStatus.Information = 0; @@ -973,7 +974,9 @@ { PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pDevObj->DeviceExtension; - Log(("VBoxGuest::vbgdNtGuestDpcHandler: pDevExt=0x%p\n", pDevExt)); - - /* test & reset the counter */ +#ifndef DEBUG_andy + LogFlowFunc(("pDevExt=0x%p\n", pDevExt)); +#endif + + /* Test & reset the counter. */ if (ASMAtomicXchgU32(&pDevExt->Core.u32MousePosChangedSeq, 0)) { @@ -1008,6 +1011,6 @@ return FALSE; - /*Log(("VBoxGuest::vbgdNtGuestIsrHandler: pDevExt = 0x%p, pVMMDevMemory = 0x%p\n", - pDevExt, pDevExt ? pDevExt->pVMMDevMemory : NULL));*/ + /*LogFlowFunc(("pDevExt=0x%p, pVMMDevMemory=0x%p\n", + pDevExt, pDevExt ? pDevExt->pVMMDevMemory : NULL));*/ /* Enter the common ISR routine and do the actual work. */ @@ -1018,9 +1021,14 @@ if (fIRQTaken) { - Log(("VBoxGuest::vbgdNtGuestIsrHandler: IRQ was taken! pInterrupt = 0x%p, pDevExt = 0x%p\n", - pInterrupt, pDevExt)); - if (ASMAtomicUoReadU32(&pDevExt->Core.u32MousePosChangedSeq) || !RTListIsEmpty(&pDevExt->Core.WakeUpList)) - { - Log(("VBoxGuest::vbgdNtGuestIsrHandler: Requesting DPC ...\n")); +#ifndef DEBUG_andy + LogFlowFunc(("IRQ was taken! pInterrupt=0x%p, pDevExt=0x%p\n", + pInterrupt, pDevExt)); +#endif + if (ASMAtomicUoReadU32( &pDevExt->Core.u32MousePosChangedSeq) + || !RTListIsEmpty(&pDevExt->Core.WakeUpList)) + { +#ifndef DEBUG_andy + LogFlowFunc(("Requesting DPC ...\n")); +#endif IoRequestDpc(pDevExt->pDeviceObject, pDevExt->pCurrentIrp, NULL); } @@ -1089,6 +1097,6 @@ { /* Enumerate the resource list. */ - Log(("VBoxGuest::vbgdNtScanPCIResourceList: Found %d resources\n", - pResList->List->PartialResourceList.Count)); + LogFlowFunc(("Found %d resources\n", + pResList->List->PartialResourceList.Count)); NTSTATUS rc = STATUS_SUCCESS; @@ -1107,8 +1115,8 @@ if (rangeCount < PCI_TYPE0_ADDRESSES) { - Log(("VBoxGuest::vbgdNtScanPCIResourceList: I/O range: Base = %08x:%08x, Length = %08x\n", - pPartialData->u.Port.Start.HighPart, - pPartialData->u.Port.Start.LowPart, - pPartialData->u.Port.Length)); + LogFlowFunc(("I/O range: Base=%08x:%08x, length=%08x\n", + pPartialData->u.Port.Start.HighPart, + pPartialData->u.Port.Start.LowPart, + pPartialData->u.Port.Length)); /* Save the IO port base. */ @@ -1123,8 +1131,8 @@ pBaseAddress->ResourceMapped = FALSE; - Log(("VBoxGuest::vbgdNtScanPCIResourceList: I/O range for VMMDev found! Base = %08x:%08x, Length = %08x\n", - pPartialData->u.Port.Start.HighPart, - pPartialData->u.Port.Start.LowPart, - pPartialData->u.Port.Length)); + LogFlowFunc(("I/O range for VMMDev found! Base=%08x:%08x, length=%08x\n", + pPartialData->u.Port.Start.HighPart, + pPartialData->u.Port.Start.LowPart, + pPartialData->u.Port.Length)); /* Next item ... */ @@ -1136,8 +1144,8 @@ case CmResourceTypeInterrupt: { - Log(("VBoxGuest::vbgdNtScanPCIResourceList: Interrupt: Level = %x, Vector = %x, Mode = %x\n", - pPartialData->u.Interrupt.Level, - pPartialData->u.Interrupt.Vector, - pPartialData->Flags)); + LogFlowFunc(("Interrupt: Level=%x, vector=%x, mode=%x\n", + pPartialData->u.Interrupt.Level, + pPartialData->u.Interrupt.Vector, + pPartialData->Flags)); /* Save information. */ @@ -1159,8 +1167,8 @@ if (rangeCount < PCI_TYPE0_ADDRESSES) { - Log(("VBoxGuest::vbgdNtScanPCIResourceList: Memory range: Base = %08x:%08x, Length = %08x\n", - pPartialData->u.Memory.Start.HighPart, - pPartialData->u.Memory.Start.LowPart, - pPartialData->u.Memory.Length)); + LogFlowFunc(("Memory range: Base=%08x:%08x, length=%08x\n", + pPartialData->u.Memory.Start.HighPart, + pPartialData->u.Memory.Start.LowPart, + pPartialData->u.Memory.Length)); /* We only care about read/write memory. */ @@ -1179,8 +1187,8 @@ pBaseAddress->ResourceMapped = FALSE; - Log(("VBoxGuest::vbgdNtScanPCIResourceList: Memory range for VMMDev found! Base = %08x:%08x, Length = %08x\n", - pPartialData->u.Memory.Start.HighPart, - pPartialData->u.Memory.Start.LowPart, - pPartialData->u.Memory.Length)); + LogFlowFunc(("Memory range for VMMDev found! Base = %08x:%08x, Length = %08x\n", + pPartialData->u.Memory.Start.HighPart, + pPartialData->u.Memory.Start.LowPart, + pPartialData->u.Memory.Length)); /* Next item ... */ @@ -1188,8 +1196,5 @@ } else - { - Log(("VBoxGuest::vbgdNtScanPCIResourceList: Ignoring memory: Flags = %08x\n", - pPartialData->Flags)); - } + LogFlowFunc(("Ignoring memory: Flags=%08x\n", pPartialData->Flags)); } break; @@ -1198,5 +1203,5 @@ default: { - Log(("VBoxGuest::vbgdNtScanPCIResourceList: Unhandled resource found, type = %d\n", pPartialData->Type)); + LogFlowFunc(("Unhandled resource found, type=%d\n", pPartialData->Type)); break; } @@ -1232,9 +1237,9 @@ { VMMDevMemory *pVMMDevMemory = (VMMDevMemory *)MmMapIoSpace(PhysAddr, cbToMap, MmNonCached); - Log(("VBoxGuest::vbgdNtMapVMMDevMemory: pVMMDevMemory = 0x%x\n", pVMMDevMemory)); + LogFlowFunc(("pVMMDevMemory = 0x%x\n", pVMMDevMemory)); if (pVMMDevMemory) { - Log(("VBoxGuest::vbgdNtMapVMMDevMemory: VMMDevMemory: Version = 0x%x, Size = %d\n", - pVMMDevMemory->u32Version, pVMMDevMemory->u32Size)); + LogFlowFunc(("VMMDevMemory: Version = 0x%x, Size = %d\n", + pVMMDevMemory->u32Version, pVMMDevMemory->u32Size)); /* Check version of the structure; do we have the right memory version? */ @@ -1246,11 +1251,12 @@ *pcbMMIO = pVMMDevMemory->u32Size; - Log(("VBoxGuest::vbgdNtMapVMMDevMemory: VMMDevMemory found and mapped! pvMMIOBase = 0x%p\n", - *ppvMMIOBase)); + LogFlowFunc(("VMMDevMemory found and mapped! pvMMIOBase = 0x%p\n", + *ppvMMIOBase)); } else { /* Not our version, refuse operation and unmap the memory. */ - Log(("VBoxGuest::vbgdNtMapVMMDevMemory: Wrong version (%u), refusing operation!\n", pVMMDevMemory->u32Version)); + LogFlowFunc(("Wrong version (%u), refusing operation!\n", pVMMDevMemory->u32Version)); + vbgdNtUnmapVMMDevMemory(pDevExt); rc = STATUS_UNSUCCESSFUL; @@ -1271,5 +1277,5 @@ void vbgdNtUnmapVMMDevMemory(PVBOXGUESTDEVEXTWIN pDevExt) { - Log(("VBoxGuest::vbgdNtUnmapVMMDevMemory: pVMMDevMemory = 0x%x\n", pDevExt->Core.pVMMDevMemory)); + LogFlowFunc(("pVMMDevMemory = 0x%x\n", pDevExt->Core.pVMMDevMemory)); if (pDevExt->Core.pVMMDevMemory) { @@ -1353,5 +1359,4 @@ #ifdef DEBUG - /** * A quick implementation of AtomicTestAndClear for uint32_t and multiple bits. @@ -1402,5 +1407,4 @@ vbgdNtTestAtomicTestAndClearBitsU32(0x22, 0x23, 0x22); } - #endif /* DEBUG */ @@ -1551,5 +1555,4 @@ return VINF_SUCCESS; } - #endif /* VBOX_WITH_DPC_LATENCY_CHECKER */