Index: /trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c =================================================================== --- /trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (revision 38894) +++ /trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (revision 38895) @@ -29,4 +29,8 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_SUP_DRV +#ifdef DEBUG_ramshankar +# define LOG_ENABLED +# define LOG_INSTANCE RTLogRelDefaultInstance() +#endif #include #include Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c (revision 38894) +++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c (revision 38895) @@ -21,4 +21,5 @@ #define LOG_GROUP LOG_GROUP_NET_ADP_DRV #ifdef DEBUG_ramshankar +# define LOG_ENABLED # define LOG_INSTANCE RTLogRelDefaultInstance() #endif @@ -214,5 +215,5 @@ int _init(void) { - LogFlowFunc((DEVICE_NAME ":_init\n")); + LogFunc((DEVICE_NAME ":_init\n")); /* @@ -247,5 +248,5 @@ int _fini(void) { - LogFlowFunc((DEVICE_NAME ":_fini\n")); + LogFunc((DEVICE_NAME ":_fini\n")); /* @@ -260,9 +261,9 @@ int _info(struct modinfo *pModInfo) { - LogFlowFunc((DEVICE_NAME ":_info\n")); + LogFunc((DEVICE_NAME ":_info\n")); int rc = mod_info(&g_VBoxNetAdpSolarisModLinkage, pModInfo); - LogFlow((DEVICE_NAME ":_info returns %d\n", rc)); + Log((DEVICE_NAME ":_info returns %d\n", rc)); return rc; } @@ -279,5 +280,5 @@ static int VBoxNetAdpSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxNetAdpSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogFunc((DEVICE_NAME ":VBoxNetAdpSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); int rc = -1; @@ -384,5 +385,5 @@ static int VBoxNetAdpSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxNetAdpSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogFunc((DEVICE_NAME ":VBoxNetAdpSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); switch (enmCmd) @@ -439,5 +440,5 @@ pMac->au8[2] = 0x27; RTRandBytes(&pMac->au8[3], 3); - LogFlow((DEVICE_NAME ":VBoxNetAdpSolarisGenerateMac Generated %.*Rhxs\n", sizeof(RTMAC), &pMac)); + Log((DEVICE_NAME ":VBoxNetAdpSolarisGenerateMac Generated %.*Rhxs\n", sizeof(RTMAC), &pMac)); return VINF_SUCCESS; } @@ -450,5 +451,5 @@ { bcopy(pszMacAddr, &pState->CurrentMac, sizeof(RTMAC)); - LogFlow((DEVICE_NAME ":vboxNetAdpSolarisSetMacAddress updated MAC %.*Rhxs\n", sizeof(RTMAC), &pState->CurrentMac)); + Log((DEVICE_NAME ":vboxNetAdpSolarisSetMacAddress updated MAC %.*Rhxs\n", sizeof(RTMAC), &pState->CurrentMac)); return GLD_SUCCESS; } Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (revision 38894) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (revision 38895) @@ -21,4 +21,5 @@ #define LOG_GROUP LOG_GROUP_NET_FLT_DRV #ifdef DEBUG_ramshankar +# define LOG_ENABLED # define LOG_INSTANCE RTLogRelDefaultInstance() #endif @@ -464,5 +465,5 @@ int _init(void) { - LogFlowFunc((DEVICE_NAME ":_init\n")); + LogFunc((DEVICE_NAME ":_init\n")); /* @@ -541,5 +542,5 @@ { int rc; - LogFlowFunc((DEVICE_NAME ":_fini\n")); + LogFunc((DEVICE_NAME ":_fini\n")); /* @@ -577,9 +578,9 @@ int _info(struct modinfo *pModInfo) { - LogFlowFunc((DEVICE_NAME ":_info\n")); + LogFunc((DEVICE_NAME ":_info\n")); int rc = mod_info(&g_VBoxNetFltSolarisModLinkage, pModInfo); - LogFlow((DEVICE_NAME ":_info returns %d\n", rc)); + Log((DEVICE_NAME ":_info returns %d\n", rc)); return rc; } @@ -596,5 +597,5 @@ static int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxNetFltSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogFunc((DEVICE_NAME ":VBoxNetFltSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); switch (enmCmd) @@ -613,5 +614,5 @@ int Interval = ddi_getprop(DDI_DEV_T_ANY, pDip, DDI_PROP_DONTPASS, VBOXNETFLT_IP6POLLINTERVAL, -1 /* default */); if (Interval == -1) - LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: no poll interval property specified. Skipping Ipv6 polling.\n")); + Log((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: no poll interval property specified. Skipping Ipv6 polling.\n")); else if (Interval < 1 || Interval > 120) { @@ -654,5 +655,5 @@ static int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxNetFltSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogFunc((DEVICE_NAME ":VBoxNetFltSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); switch (enmCmd) @@ -690,5 +691,5 @@ static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppResult) { - LogFlowFunc((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, + LogFunc((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, getminor((dev_t)pvArg))); @@ -728,5 +729,5 @@ Assert(pQueue); - LogFlowFunc((DEVICE_NAME ":VBoxNetFltSolarisModOpen pQueue=%p pDev=%p fOpenMode=%d fStreamMode=%d\n", pQueue, pDev, + LogFunc((DEVICE_NAME ":VBoxNetFltSolarisModOpen pQueue=%p pDev=%p fOpenMode=%d fStreamMode=%d\n", pQueue, pDev, fOpenMode, fStreamMode)); @@ -911,5 +912,5 @@ NOREF(fOpenMode); - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModOpen returns 0, DevMinor=%d pQueue=%p\n", DevMinor, pStream->pReadQueue)); + Log((DEVICE_NAME ":VBoxNetFltSolarisModOpen returns 0, DevMinor=%d pQueue=%p\n", DevMinor, pStream->pReadQueue)); return 0; @@ -930,5 +931,5 @@ Assert(pQueue); - LogFlowFunc((DEVICE_NAME ":VBoxNetFltSolarisModClose pQueue=%p fOpenMode=%d\n", pQueue, fOpenMode)); + LogFunc((DEVICE_NAME ":VBoxNetFltSolarisModClose pQueue=%p fOpenMode=%d\n", pQueue, fOpenMode)); vboxnetflt_stream_t *pStream = NULL; @@ -1053,5 +1054,5 @@ return 0; - LogFlowFunc((DEVICE_NAME ":VBoxNetFltSolarisModReadPut pQueue=%p pMsg=%p\n", pQueue, pMsg)); + LogFunc((DEVICE_NAME ":VBoxNetFltSolarisModReadPut pQueue=%p pMsg=%p\n", pQueue, pMsg)); bool fSendUpstream = true; @@ -1087,5 +1088,5 @@ case M_DATA: { - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut M_DATA\n")); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut M_DATA\n")); if ( fActive @@ -1103,5 +1104,5 @@ t_uscalar_t Prim = pPrim->dl_primitive; - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_PCPROTO %d\n", Prim)); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_PCPROTO %d\n", Prim)); switch (Prim) { @@ -1134,5 +1135,5 @@ bcopy(pMsg->b_rptr + cOffset, &pThis->u.s.MacAddr, sizeof(pThis->u.s.MacAddr)); - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_PHYS_ADDR. New Mac=%.*Rhxs\n", + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_PHYS_ADDR. New Mac=%.*Rhxs\n", sizeof(pThis->u.s.MacAddr), &pThis->u.s.MacAddr)); break; @@ -1142,5 +1143,5 @@ { if (ASMAtomicXchgBool(&pThis->fDisconnectedFromHost, false)) - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_UP.\n")); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_UP.\n")); break; } @@ -1149,5 +1150,5 @@ { if (!ASMAtomicXchgBool(&pThis->fDisconnectedFromHost, true)) - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_DOWN.\n")); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_DOWN.\n")); break; } @@ -1161,5 +1162,5 @@ * Swallow our bind request acknowledgement. */ - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_BIND_ACK. Bound to requested SAP!\n")); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_BIND_ACK. Bound to requested SAP!\n")); break; } @@ -1182,10 +1183,10 @@ if (pOkAck->dl_correct_primitive == DL_PROMISCON_REQ) { - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_PCPROTO: DL_OK_ACK: fPromisc is ON.\n")); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_PCPROTO: DL_OK_ACK: fPromisc is ON.\n")); pPromiscStream->fPromisc = true; } else if (pOkAck->dl_correct_primitive == DL_PROMISCOFF_REQ) { - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_PCPROTO: DL_OK_ACK: fPromisc is OFF.\n")); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_PCPROTO: DL_OK_ACK: fPromisc is OFF.\n")); pPromiscStream->fPromisc = false; } @@ -1205,5 +1206,5 @@ { pPromiscStream->fRawMode = true; - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Mode acknowledgement. RawMode is %s\n", + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Mode acknowledgement. RawMode is %s\n", pPromiscStream->fRawMode ? "ON" : "OFF")); } @@ -1231,5 +1232,5 @@ * We must support flushing queues. */ - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_FLUSH\n")); + Log((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: M_FLUSH\n")); if (*pMsg->b_rptr & FLUSHR) flushq(pQueue, FLUSHALL); @@ -1276,5 +1277,5 @@ static int VBoxNetFltSolarisModWritePut(queue_t *pQueue, mblk_t *pMsg) { - LogFlowFunc((DEVICE_NAME ":VBoxNetFltSolarisModWritePut pQueue=%p pMsg=%p\n", pQueue, pMsg)); + LogFunc((DEVICE_NAME ":VBoxNetFltSolarisModWritePut pQueue=%p pMsg=%p\n", pQueue, pMsg)); putnext(pQueue, pMsg); @@ -1291,5 +1292,5 @@ static int vboxNetFltSolarisSetRawMode(vboxnetflt_promisc_stream_t *pPromiscStream) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisSetRawMode pPromiscStream=%p\n", pPromiscStream)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisSetRawMode pPromiscStream=%p\n", pPromiscStream)); mblk_t *pRawMsg = NULL; @@ -1320,5 +1321,5 @@ static int vboxNetFltSolarisSetFastMode(queue_t *pQueue) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisSetFastMode pQueue=%p\n", pQueue)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisSetFastMode pQueue=%p\n", pQueue)); mblk_t *pFastMsg = mkiocb(DL_IOC_HDR_INFO); @@ -1369,5 +1370,5 @@ static int vboxNetFltSolarisPromiscReq(queue_t *pQueue, bool fPromisc) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisPromiscReq pQueue=%p fPromisc=%d\n", pQueue, fPromisc)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisPromiscReq pQueue=%p fPromisc=%d\n", pQueue, fPromisc)); t_uscalar_t Cmd; @@ -1496,5 +1497,5 @@ static int vboxNetFltSolarisPhysAddrReq(queue_t *pQueue) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisPhysAddrReq pQueue=%p\n", pQueue)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisPhysAddrReq pQueue=%p\n", pQueue)); t_uscalar_t Cmd = DL_PHYS_ADDR_REQ; @@ -1521,5 +1522,5 @@ static void vboxNetFltSolarisCachePhysAddr(PVBOXNETFLTINS pThis, mblk_t *pMsg) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisCachePhysAddr pThis=%p pMsg=%p\n", pThis, pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisCachePhysAddr pThis=%p pMsg=%p\n", pThis, pMsg)); AssertCompile(sizeof(RTMAC) == ETHERADDRL); @@ -1529,5 +1530,5 @@ bcopy(pMsg->b_rptr + pPhysAddrAck->dl_addr_offset, &pThis->u.s.MacAddr, sizeof(pThis->u.s.MacAddr)); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisCachePhysAddr: DL_PHYS_ADDR_ACK: Mac=%.*Rhxs\n", + Log((DEVICE_NAME ":vboxNetFltSolarisCachePhysAddr: DL_PHYS_ADDR_ACK: Mac=%.*Rhxs\n", sizeof(pThis->u.s.MacAddr), &pThis->u.s.MacAddr)); @@ -1557,5 +1558,5 @@ static int vboxNetFltSolarisBindReq(queue_t *pQueue, int SAP) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisBindReq SAP=%d\n", SAP)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisBindReq SAP=%d\n", SAP)); mblk_t *pBindMsg = mexchange(NULL, NULL, DL_BIND_REQ_SIZE, M_PROTO, DL_BIND_REQ); @@ -1583,5 +1584,5 @@ static int vboxNetFltSolarisNotifyReq(queue_t *pQueue) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisNotifyReq\n")); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisNotifyReq\n")); mblk_t *pNotifyMsg = mexchange(NULL, NULL, DL_NOTIFY_REQ_SIZE, M_PROTO, DL_NOTIFY_REQ); @@ -1818,5 +1819,5 @@ static int vboxNetFltSolarisRelinkIp4(vnode_t *pVNode, struct lifreq *pInterface, int IpMuxFd, int ArpMuxFd) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisRelinkIp4: pVNode=%p pInterface=%p IpMuxFd=%d ArpMuxFd=%d\n", pVNode, + LogFunc((DEVICE_NAME ":vboxNetFltSolarisRelinkIp4: pVNode=%p pInterface=%p IpMuxFd=%d ArpMuxFd=%d\n", pVNode, pInterface, IpMuxFd, ArpMuxFd)); @@ -1853,5 +1854,5 @@ static int vboxNetFltSolarisRelinkIp6(vnode_t *pVNode, struct lifreq *pInterface, int Ip6MuxFd) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisRelinkIp6: pVNode=%p pInterface=%p Ip6MuxFd=%d\n", pVNode, pInterface, Ip6MuxFd)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisRelinkIp6: pVNode=%p pInterface=%p Ip6MuxFd=%d\n", pVNode, pInterface, Ip6MuxFd)); int NewIp6MuxId; @@ -1882,5 +1883,5 @@ static int vboxNetFltSolarisDetermineModPos(bool fAttach, vnode_t *pVNode, int *pModPos) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: fAttach=%d pVNode=%p pModPos=%p\n", fAttach, pVNode, pModPos)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: fAttach=%d pVNode=%p pModPos=%p\n", fAttach, pVNode, pModPos)); int cMod; @@ -1898,5 +1899,5 @@ * the host driver. */ - LogFlow((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: cMod=%d\n", cMod)); + Log((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: cMod=%d\n", cMod)); if (fAttach) { @@ -1914,5 +1915,5 @@ if (RT_UNLIKELY(!StrList.sl_modlist)) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: failed to alloc memory for StrList.\n")); + Log((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: failed to alloc memory for StrList.\n")); return VERR_NO_MEMORY; } @@ -1932,5 +1933,5 @@ if (!strcmp(DEVICE_NAME, StrList.sl_modlist[i].l_name)) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: Success! Found %s at %d.\n", DEVICE_NAME, i)); + Log((DEVICE_NAME ":vboxNetFltSolarisDetermineModPos: Success! Found %s at %d.\n", DEVICE_NAME, i)); *pModPos = i; RTMemFree(StrList.sl_modlist); @@ -2130,5 +2131,5 @@ static void vboxNetFltSolarisCloseStream(PVBOXNETFLTINS pThis) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisCloseStream pThis=%p\n")); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisCloseStream pThis=%p\n")); if (pThis->u.s.hIface) @@ -2149,5 +2150,5 @@ static int vboxNetFltSolarisAttachIp4(PVBOXNETFLTINS pThis, bool fAttach) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisAttachIp4 pThis=%p fAttach=%d\n", pThis, fAttach)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisAttachIp4 pThis=%p fAttach=%d\n", pThis, fAttach)); /* @@ -2333,5 +2334,5 @@ releasef(ArpMuxFd); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: Success! %s %s@(IPv4:%d Arp:%d) " + Log((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: Success! %s %s@(IPv4:%d Arp:%d) " "%s interface %s\n", fAttach ? "Injected" : "Ejected", StrMod.mod_name, StrMod.pos, ArpStrMod.pos, fAttach ? "to" : "from", pThis->szName)); @@ -2416,5 +2417,5 @@ static int vboxNetFltSolarisAttachIp6(PVBOXNETFLTINS pThis, bool fAttach) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisAttachIp6 pThis=%p fAttach=%d\n", pThis, fAttach)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisAttachIp6 pThis=%p fAttach=%d\n", pThis, fAttach)); /* @@ -2545,5 +2546,5 @@ releasef(Ip6MuxFd); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachIp6: Success! %s %s@(IPv6:%d) " + Log((DEVICE_NAME ":vboxNetFltSolarisAttachIp6: Success! %s %s@(IPv6:%d) " "%s interface %s\n", fAttach ? "Injected" : "Ejected", StrMod.mod_name, StrMod.pos, fAttach ? "to" : "from", pThis->szName)); @@ -2593,5 +2594,5 @@ else { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachIp6: failed to get IPv6 flags.\n", pThis->szName)); + Log((DEVICE_NAME ":vboxNetFltSolarisAttachIp6: failed to get IPv6 flags.\n", pThis->szName)); rc = VERR_INTNET_FLT_IF_NOT_FOUND; } @@ -2613,5 +2614,5 @@ static void vboxNetFltSolarispIp6Timer(PRTTIMER pTimer, void *pvData, uint64_t iTick) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarispIp6Timer pTimer=%p pvData=%p\n", pTimer, pvData)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarispIp6Timer pTimer=%p pvData=%p\n", pTimer, pvData)); PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)pvData; @@ -2652,5 +2653,5 @@ static int vboxNetFltSolarisSetupIp6Polling(PVBOXNETFLTINS pThis) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling pThis=%p\n", pThis)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling pThis=%p\n", pThis)); int rc = VERR_GENERAL_FAILURE; @@ -2679,5 +2680,5 @@ { rc = RTTimerStart(pPromiscStream->pIp6Timer, 10 * (uint64_t)1000000000 /* 10 seconds to blastoff */); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Ipv6 %d second timer begins firing in 10 seconds.\n", Interval)); + Log((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Ipv6 %d second timer begins firing in 10 seconds.\n", Interval)); } else @@ -2704,5 +2705,5 @@ static int vboxNetFltSolarisDetachFromInterface(PVBOXNETFLTINS pThis) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisDetachFromInterface pThis=%p\n", pThis)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisDetachFromInterface pThis=%p\n", pThis)); ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true); @@ -2737,5 +2738,5 @@ static int vboxNetFltSolarisAttachToInterface(PVBOXNETFLTINS pThis) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface pThis=%p\n", pThis)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface pThis=%p\n", pThis)); /* @@ -2815,5 +2816,5 @@ static mblk_t *vboxNetFltSolarisMBlkFromSG(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisMBlkFromSG pThis=%p pSG=%p\n", pThis, pSG)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisMBlkFromSG pThis=%p pSG=%p\n", pThis, pSG)); mblk_t *pMsg = allocb(pSG->cbTotal, BPRI_MED); @@ -2879,5 +2880,5 @@ static int vboxNetFltSolarisMBlkToSG(PVBOXNETFLTINS pThis, mblk_t *pMsg, PINTNETSG pSG, unsigned cSegs, uint32_t fSrc) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pThis=%p pMsg=%p pSG=%p cSegs=%d\n", pThis, pMsg, pSG, cSegs)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pThis=%p pMsg=%p pSG=%p cSegs=%d\n", pThis, pMsg, pSG, cSegs)); /* @@ -2906,5 +2907,5 @@ if (pSG->cbTotal < 60 && (fSrc & INTNETTRUNKDIR_HOST)) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pulling up to length.\n")); + Log((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pulling up to length.\n")); static uint8_t const s_abZero[128] = {0}; @@ -2918,5 +2919,5 @@ #endif - LogFlow((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG iSeg=%d pSG->cbTotal=%d msgdsize=%d\n", iSeg, pSG->cbTotal, msgdsize(pMsg))); + Log((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG iSeg=%d pSG->cbTotal=%d msgdsize=%d\n", iSeg, pSG->cbTotal, msgdsize(pMsg))); return VINF_SUCCESS; } @@ -2936,5 +2937,5 @@ static int vboxNetFltSolarisRawToUnitData(mblk_t *pMsg, mblk_t **ppDlpiMsg) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData pMsg=%p\n", pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData pMsg=%p\n", pMsg)); if (DB_TYPE(pMsg) != M_DATA) @@ -2988,5 +2989,5 @@ static int vboxNetFltSolarisUnitDataToRaw(PVBOXNETFLTINS pThis, mblk_t *pMsg, mblk_t **ppRawMsg) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisUnitDataToRaw pMsg=%p\n", pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisUnitDataToRaw pMsg=%p\n", pMsg)); if ( !pMsg->b_cont @@ -3107,5 +3108,5 @@ Assert(pPromiscStream); - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback pThis=%p pPromiscStream=%p pMsg=%p\n", pThis, pPromiscStream, pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback pThis=%p pPromiscStream=%p pMsg=%p\n", pThis, pPromiscStream, pMsg)); if (RT_UNLIKELY(pMsg->b_cont)) @@ -3148,5 +3149,5 @@ pPromiscStream->cLoopback++; - LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback initialized head. checksum=%u.\n", + Log((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback initialized head. checksum=%u.\n", pPromiscStream->pHead->Checksum)); break; @@ -3158,5 +3159,5 @@ vboxNetFltSolarisInitPacketId(pCur, pMsg); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback re-used head checksum=%u cLoopback=%d.\n", + Log((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback re-used head checksum=%u cLoopback=%d.\n", pCur->Checksum, pPromiscStream->cLoopback)); break; @@ -3177,5 +3178,5 @@ pPromiscStream->cLoopback++; - LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback added head checksum=%u cLoopback=%d.\n", pCur->Checksum, + Log((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback added head checksum=%u cLoopback=%d.\n", pCur->Checksum, pPromiscStream->cLoopback)); break; @@ -3210,5 +3211,5 @@ vboxNetFltSolarisInitPacketId(pCur, pMsg); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback recycled tail!! checksum=%u cLoopback=%d\n", pCur->Checksum, + Log((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback recycled tail!! checksum=%u cLoopback=%d\n", pCur->Checksum, pPromiscStream->cLoopback)); } @@ -3235,5 +3236,5 @@ Assert(DB_TYPE(pMsg) == M_DATA); - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk pThis=%p pMsg=%p\n", pThis, pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk pThis=%p pMsg=%p\n", pThis, pMsg)); if (pMsg->b_cont) @@ -3298,10 +3299,10 @@ fIsOurPacket = true; - LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p Checksum=%u cLoopback=%d\n", pMsg, Checksum, + Log((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p Checksum=%u cLoopback=%d\n", pMsg, Checksum, pPromiscStream->cLoopback)); break; } - LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk returns %d.\n", fIsOurPacket)); + Log((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk returns %d.\n", fIsOurPacket)); mutex_exit(&pThis->u.s.hMtx); return fIsOurPacket; @@ -3335,5 +3336,5 @@ static int vboxNetFltSolarisRecv(PVBOXNETFLTINS pThis, vboxnetflt_stream_t *pStream, queue_t *pQueue, mblk_t *pMsg) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisRecv pThis=%p pMsg=%p\n", pThis, pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisRecv pThis=%p pMsg=%p\n", pThis, pMsg)); AssertCompile(sizeof(struct ether_header) == sizeof(RTNETETHERHDR)); @@ -3377,5 +3378,5 @@ if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg)) { - LogFlow((DEVICE_NAME ":Avoiding packet loopback.\n")); + Log((DEVICE_NAME ":Avoiding packet loopback.\n")); return VINF_SUCCESS; } @@ -3435,5 +3436,5 @@ PVLANHEADER pVlanHdr = (PVLANHEADER)(pMsg->b_rptr + sizeof(RTNETETHERHDR) - sizeof(pEthHdr->EtherType)); - LogFlow((DEVICE_NAME ":Recv VLAN Pcp=%u Cfi=%u Id=%u\n", VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)), + Log((DEVICE_NAME ":Recv VLAN Pcp=%u Cfi=%u Id=%u\n", VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_CFI(RT_BE2H_U16(pVlanHdr->Data)), VLAN_ID(RT_BE2H_U16(pVlanHdr->Data)))); if ( VLAN_PRI(RT_BE2H_U16(pVlanHdr->Data)) > 0 @@ -3461,5 +3462,5 @@ pStrippedMsg->b_cont = pMsg; pMsg = pStrippedMsg; - LogFlow((DEVICE_NAME ":Stripped VLAN tag.\n")); + Log((DEVICE_NAME ":Stripped VLAN tag.\n")); } else @@ -3522,5 +3523,5 @@ static mblk_t *vboxNetFltSolarisFixChecksums(mblk_t *pMsg) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisFixChecksums pMsg=%p\n")); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisFixChecksums pMsg=%p\n")); Assert(DB_TYPE(pMsg) == M_DATA); @@ -3542,5 +3543,5 @@ if (pMsg->b_cont) { - LogFlow((DEVICE_NAME ":Chained mblk_t.\n")); + Log((DEVICE_NAME ":Chained mblk_t.\n")); /* @@ -3551,5 +3552,5 @@ size_t cbFullMsg = msgdsize(pMsg); mblk_t *pFullMsg = allocb(cbFullMsg, BPRI_MED); - LogFlow((DEVICE_NAME ":msgdsize returns %d\n", cbFullMsg)); + Log((DEVICE_NAME ":msgdsize returns %d\n", cbFullMsg)); if (RT_UNLIKELY(!pFullMsg)) { @@ -3596,5 +3597,5 @@ pTcpHdr->th_sum = TcpChecksum; fChecksumAdjusted = true; - LogFlow((DEVICE_NAME ":fixed TCP checksum.\n")); + Log((DEVICE_NAME ":fixed TCP checksum.\n")); } } @@ -3608,5 +3609,5 @@ pUdpHdr->uh_sum = UdpChecksum; fChecksumAdjusted = true; - LogFlow((DEVICE_NAME ":Fixed UDP checksum.")); + Log((DEVICE_NAME ":Fixed UDP checksum.")); } } @@ -3649,5 +3650,5 @@ static void vboxNetFltSolarisAnalyzeMBlk(mblk_t *pMsg) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisAnalyzeMBlk pMsg=%p\n", pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisAnalyzeMBlk pMsg=%p\n", pMsg)); PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr; @@ -3676,5 +3677,5 @@ else { - LogFlow((DEVICE_NAME ":Chained IP packet. Skipping validity check.\n")); + Log((DEVICE_NAME ":Chained IP packet. Skipping validity check.\n")); } } @@ -3704,5 +3705,5 @@ LogRel((DEVICE_NAME ":Unknown EtherType=%x D=%.6Rhxs S=%.6Rhxs\n", RT_H2BE_U16(pEthHdr->EtherType), &pEthHdr->DstMac, &pEthHdr->SrcMac)); - /* LogFlow((DEVICE_NAME ":%.*Rhxd\n", MBLKL(pMsg), pMsg->b_rptr)); */ + /* Log((DEVICE_NAME ":%.*Rhxd\n", MBLKL(pMsg), pMsg->b_rptr)); */ } } @@ -3716,5 +3717,5 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltPortOsSetActive pThis=%p fActive=%d\n", pThis, fActive)); + LogFunc((DEVICE_NAME ":vboxNetFltPortOsSetActive pThis=%p fActive=%d\n", pThis, fActive)); /* @@ -3750,5 +3751,5 @@ int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltOsDisconnectIt pThis=%p\n", pThis)); + LogFunc((DEVICE_NAME ":vboxNetFltOsDisconnectIt pThis=%p\n", pThis)); vboxNetFltSolarisDetachFromInterface(pThis); @@ -3767,5 +3768,5 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n", pThis)); + LogFunc((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n", pThis)); mutex_destroy(&pThis->u.s.hMtx); @@ -3784,5 +3785,5 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p\n")); + LogFunc((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p\n")); /* @@ -3872,5 +3873,5 @@ { NOREF(pvIfData); - LogFlowFunc((DEVICE_NAME ":vboxNetFltPortOsXmit pThis=%p pSG=%p fDst=%d\n", pThis, pSG, fDst)); + LogFunc((DEVICE_NAME ":vboxNetFltPortOsXmit pThis=%p pSG=%p fDst=%d\n", pThis, pSG, fDst)); int rc = VINF_SUCCESS; @@ -3883,5 +3884,5 @@ if (RT_LIKELY(pMsg)) { - LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n")); + Log((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n")); vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg); @@ -3919,5 +3920,5 @@ if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_ARP)) { - LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n")); + Log((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n")); vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtrT(&pThis->u.s.pArpStream, vboxnetflt_stream_t *); @@ -3955,5 +3956,5 @@ * Send messages up IPv6 stream. */ - LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv6\n")); + Log((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv6\n")); pMsg->b_rptr += sizeof(RTNETETHERHDR); @@ -3966,5 +3967,5 @@ * Send messages up IPv4 stream. */ - LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv4\n")); + Log((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv4\n")); pMsg->b_rptr += sizeof(RTNETETHERHDR); Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c (revision 38894) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c (revision 38895) @@ -21,4 +21,5 @@ #define LOG_GROUP LOG_GROUP_NET_FLT_DRV #ifdef DEBUG_ramshankar +# define LOG_ENABLED # define LOG_INSTANCE RTLogRelDefaultInstance() #endif @@ -260,5 +261,4 @@ LOCAL inline int vboxNetFltSolarisGetLinkId(const char *pszMacName, datalink_id_t *pLinkId); - /** * Kernel entry points @@ -266,5 +266,5 @@ int _init(void) { - LogFlow((DEVICE_NAME ":_init\n")); + Log((DEVICE_NAME ":_init\n")); /* @@ -326,5 +326,5 @@ { int rc; - LogFlow((DEVICE_NAME ":_fini\n")); + Log((DEVICE_NAME ":_fini\n")); /* @@ -356,9 +356,9 @@ int _info(struct modinfo *pModInfo) { - LogFlow((DEVICE_NAME ":_info\n")); + Log((DEVICE_NAME ":_info\n")); int rc = mod_info(&g_VBoxNetFltSolarisModLinkage, pModInfo); - LogFlow((DEVICE_NAME ":_info returns %d\n", rc)); + Log((DEVICE_NAME ":_info returns %d\n", rc)); return rc; } @@ -375,5 +375,6 @@ LOCAL int VBoxNetFltSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd) { - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + Log((DEVICE_NAME ":VBoxNetFltSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogRel((DEVICE_NAME ":blah\n")); switch (enmCmd) @@ -408,5 +409,5 @@ LOCAL int VBoxNetFltSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd) { - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + Log((DEVICE_NAME ":VBoxNetFltSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); switch (enmCmd) @@ -443,5 +444,5 @@ LOCAL int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppResult) { - LogFlow((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, getminor((dev_t)pvArg))); + Log((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, getminor((dev_t)pvArg))); switch (enmCmd) @@ -475,5 +476,5 @@ LOCAL inline mblk_t *vboxNetFltSolarisMBlkFromSG(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisMBlkFromSG pThis=%p pSG=%p\n", pThis, pSG)); + Log((DEVICE_NAME ":vboxNetFltSolarisMBlkFromSG pThis=%p pSG=%p\n", pThis, pSG)); mblk_t *pMsg = allocb(pSG->cbTotal, BPRI_HI); @@ -540,5 +541,5 @@ LOCAL int vboxNetFltSolarisMBlkToSG(PVBOXNETFLTINS pThis, mblk_t *pMsg, PINTNETSG pSG, unsigned cSegs, uint32_t fSrc) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pThis=%p pMsg=%p pSG=%p cSegs=%d\n", pThis, pMsg, pSG, cSegs)); + Log((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pThis=%p pMsg=%p pSG=%p cSegs=%d\n", pThis, pMsg, pSG, cSegs)); /* @@ -567,5 +568,5 @@ if (pSG->cbTotal < 60 && (fSrc & INTNETTRUNKDIR_HOST)) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pulling up to length.\n")); + Log((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG pulling up to length.\n")); static uint8_t const s_abZero[128] = {0}; @@ -579,5 +580,5 @@ #endif - LogFlow((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG iSeg=%d pSG->cbTotal=%d msgdsize=%d\n", iSeg, pSG->cbTotal, msgdsize(pMsg))); + Log((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG iSeg=%d pSG->cbTotal=%d msgdsize=%d\n", iSeg, pSG->cbTotal, msgdsize(pMsg))); return VINF_SUCCESS; } @@ -591,5 +592,5 @@ LOCAL void vboxNetFltSolarisAnalyzeMBlk(mblk_t *pMsg) { - LogFlowFunc((DEVICE_NAME ":vboxNetFltSolarisAnalyzeMBlk pMsg=%p\n", pMsg)); + LogFunc((DEVICE_NAME ":vboxNetFltSolarisAnalyzeMBlk pMsg=%p\n", pMsg)); PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr; @@ -617,5 +618,5 @@ else { - LogFlow((DEVICE_NAME ":Chained IP packet. Skipping validity check.\n")); + Log((DEVICE_NAME ":Chained IP packet. Skipping validity check.\n")); } } @@ -645,5 +646,5 @@ LogRel((DEVICE_NAME ":Unknown EtherType=%x D=%.6Rhxs S=%.6Rhxs\n", RT_H2BE_U16(pEthHdr->EtherType), &pEthHdr->DstMac, &pEthHdr->SrcMac)); - /* LogFlow((DEVICE_NAME ":%.*Rhxd\n", MBLKL(pMsg), pMsg->b_rptr)); */ + /* Log((DEVICE_NAME ":%.*Rhxd\n", MBLKL(pMsg), pMsg->b_rptr)); */ } } @@ -671,5 +672,5 @@ LOCAL void vboxNetFltSolarisRecv(void *pvData, mac_resource_handle_t hResource, mblk_t *pMsg, boolean_t fLoopback) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisRecv pvData=%p pMsg=%p fLoopback=%d cbData=%d\n", pvData, pMsg, fLoopback, pMsg ? MBLKL(pMsg) : 0)); + Log((DEVICE_NAME ":vboxNetFltSolarisRecv pvData=%p pMsg=%p fLoopback=%d cbData=%d\n", pvData, pMsg, fLoopback, pMsg ? MBLKL(pMsg) : 0)); PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)pvData; @@ -803,5 +804,5 @@ { Assert(pThis->pSwitchPort); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisReportInfo phys mac %.6Rhxs\n", &pThis->u.s.MacAddr)); + Log((DEVICE_NAME ":vboxNetFltSolarisReportInfo phys mac %.6Rhxs\n", &pThis->u.s.MacAddr)); pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr); pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, false); /** @todo Promisc */ @@ -851,5 +852,5 @@ if (RT_LIKELY(!rc)) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisInitVNIC succesfully initialized VNIC.\n")); + Log((DEVICE_NAME ":vboxNetFltSolarisInitVNIC succesfully initialized VNIC.\n")); return VINF_SUCCESS; } @@ -881,5 +882,5 @@ LOCAL int vboxNetFltSolarisInitVNICTemplate(PVBOXNETFLTINS pThis, PVBOXNETFLTVNICTEMPLATE pVNICTemplate) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisInitVNICTemplate pThis=%p pVNICTemplate=%p\n", pThis, pVNICTemplate)); + Log((DEVICE_NAME ":vboxNetFltSolarisInitVNICTemplate pThis=%p pVNICTemplate=%p\n", pThis, pVNICTemplate)); AssertReturn(pVNICTemplate, VERR_INVALID_PARAMETER); @@ -926,5 +927,5 @@ mac_close(hInterface); - LogFlow((DEVICE_NAME ":vboxNetFltSolarisInitVNICTemplate successfully init. VNIC template. szLinkName=%s\n", + Log((DEVICE_NAME ":vboxNetFltSolarisInitVNICTemplate successfully init. VNIC template. szLinkName=%s\n", pVNICTemplate->szLinkName)); return VINF_SUCCESS; @@ -1061,5 +1062,5 @@ LOCAL int vboxNetFltSolarisCreateVNIC(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC *ppVNIC) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC pThis=%p\n", pThis)); + Log((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC pThis=%p\n", pThis)); AssertReturn(pThis, VERR_INVALID_POINTER); @@ -1120,5 +1121,5 @@ fFlags |= MAC_VLAN; #endif - LogFlow((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC pThis=%p VLAN Id=%u\n", pThis, uVLANId)); + Log((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC pThis=%p VLAN Id=%u\n", pThis, uVLANId)); } @@ -1149,5 +1150,5 @@ if (RT_SUCCESS(rc)) { - LogFlow((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC successfully created VNIC '%s' over '%s' with random mac %.6Rhxs\n", + Log((DEVICE_NAME ":vboxNetFltSolarisCreateVNIC successfully created VNIC '%s' over '%s' with random mac %.6Rhxs\n", pVNIC->szName, pszLinkName, &GuestMac)); *ppVNIC = pVNIC; @@ -1254,5 +1255,5 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive) { - LogFlow((DEVICE_NAME ":vboxNetFltPortOsSetActive pThis=%p fActive=%d\n", pThis, fActive)); + Log((DEVICE_NAME ":vboxNetFltPortOsSetActive pThis=%p fActive=%d\n", pThis, fActive)); /* @@ -1287,5 +1288,5 @@ int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis) { - LogFlow((DEVICE_NAME ":vboxNetFltOsDisconnectIt pThis=%p\n", pThis)); + Log((DEVICE_NAME ":vboxNetFltOsDisconnectIt pThis=%p\n", pThis)); return VINF_SUCCESS; } @@ -1294,5 +1295,5 @@ int vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis) { - LogFlow((DEVICE_NAME ":vboxNetFltOsConnectIt pThis=%p\n", pThis)); + Log((DEVICE_NAME ":vboxNetFltOsConnectIt pThis=%p\n", pThis)); return VINF_SUCCESS; } @@ -1301,5 +1302,5 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis) { - LogFlow((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n", pThis)); + Log((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n", pThis)); if (pThis->u.s.hNotify) @@ -1325,5 +1326,5 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext) { - LogFlow((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p pvContext=%p\n", pThis, pvContext)); + Log((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p pvContext=%p\n", pThis, pvContext)); /* @@ -1338,5 +1339,5 @@ if (!rc) { - LogFlow((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p physical interface '%s' detected.\n", pThis, pThis->szName)); + Log((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p physical interface '%s' detected.\n", pThis, pThis->szName)); pThis->u.s.fIsVNIC = false; } @@ -1346,5 +1347,5 @@ if (RTStrNCmp(pThis->szName, VBOXBOW_VNIC_TEMPLATE_NAME, sizeof(VBOXBOW_VNIC_TEMPLATE_NAME) - 1) == 0) { - LogFlow((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p VNIC template '%s' detected.\n", pThis, pThis->szName)); + Log((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p VNIC template '%s' detected.\n", pThis, pThis->szName)); pThis->u.s.fIsVNICTemplate = true; } @@ -1353,5 +1354,5 @@ if ( pThis->u.s.fIsVNIC && !pThis->u.s.fIsVNICTemplate) - LogFlow((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p VNIC '%s' detected.\n", pThis, pThis->szName)); + Log((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p VNIC '%s' detected.\n", pThis, pThis->szName)); /* @@ -1415,5 +1416,5 @@ if (RT_LIKELY(pMsg)) { - LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit pThis=%p cbData=%d\n", pThis, MBLKL(pMsg))); + Log((DEVICE_NAME ":vboxNetFltPortOsXmit pThis=%p cbData=%d\n", pThis, MBLKL(pMsg))); mac_tx_cookie_t pXmitCookie = mac_tx(pVNIC->hClient, pMsg, 0 /* Hint */, MAC_DROP_ON_NO_DESC, NULL /* return message */); @@ -1437,5 +1438,5 @@ void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRTMAC pMac) { - LogFlow((DEVICE_NAME ":vboxNetFltPortOSNotifyMacAddress pszIf=%s pszVNIC=%s MAC=%.6Rhxs\n", pThis->szName, + Log((DEVICE_NAME ":vboxNetFltPortOSNotifyMacAddress pszIf=%s pszVNIC=%s MAC=%.6Rhxs\n", pThis->szName, ((PVBOXNETFLTVNIC)pvIfData)->szName, pMac)); @@ -1496,5 +1497,5 @@ */ mac_rx_set(pVNIC->hClient, vboxNetFltSolarisRecv, pThis); - LogFlow((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress successfully added unicast address %.6Rhxs\n", pMac)); + Log((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress successfully added unicast address %.6Rhxs\n", pMac)); } else @@ -1530,5 +1531,5 @@ int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **ppvIfData) { - LogFlow((DEVICE_NAME ":vboxNetFltPortOsConnectInterface pThis=%p pvIf=%p\n", pThis, pvIf)); + Log((DEVICE_NAME ":vboxNetFltPortOsConnectInterface pThis=%p pvIf=%p\n", pThis, pvIf)); int rc = VINF_SUCCESS; @@ -1618,5 +1619,5 @@ int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, void *pvIfData) { - LogFlow((DEVICE_NAME ":vboxNetFltPortOsDisconnectInterface pThis=%p\n", pThis)); + Log((DEVICE_NAME ":vboxNetFltPortOsDisconnectInterface pThis=%p\n", pThis)); PVBOXNETFLTVNIC pVNIC = pvIfData; @@ -1634,5 +1635,5 @@ */ list_remove(&pThis->u.s.hVNICs, pVNIC); - LogFlow((DEVICE_NAME ":vboxNetFltPortOsDisconnectInterface destroying pVNIC=%p\n", pVNIC)); + Log((DEVICE_NAME ":vboxNetFltPortOsDisconnectInterface destroying pVNIC=%p\n", pVNIC)); vboxNetFltSolarisDestroyVNIC(pVNIC); vboxNetFltSolarisFreeVNIC(pVNIC); Index: /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c (revision 38894) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c (revision 38895) @@ -21,4 +21,5 @@ #define LOG_GROUP LOG_GROUP_USB_DRV #ifdef DEBUG_ramshankar +# define LOG_ENABLED # define LOG_INSTANCE RTLogRelDefaultInstance() #endif @@ -375,5 +376,5 @@ int _init(void) { - LogFlowFunc((DEVICE_NAME ":_init\n")); + LogFunc((DEVICE_NAME ":_init\n")); /* @@ -417,5 +418,5 @@ int rc; - LogFlowFunc((DEVICE_NAME ":_fini\n")); + LogFunc((DEVICE_NAME ":_fini\n")); rc = mod_remove(&g_VBoxUSBSolarisModLinkage); @@ -432,5 +433,5 @@ int _info(struct modinfo *pModInfo) { - LogFlowFunc((DEVICE_NAME ":_info\n")); + LogFunc((DEVICE_NAME ":_info\n")); return mod_info(&g_VBoxUSBSolarisModLinkage, pModInfo); @@ -448,5 +449,5 @@ int VBoxUSBSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); int rc; @@ -511,5 +512,5 @@ if (rc == USB_SUCCESS) { - LogFlow((DEVICE_NAME ":VBoxUSBSolarisAttach cbMaxBulkXfer=%d\n", pState->cbMaxBulkXfer)); + Log((DEVICE_NAME ":VBoxUSBSolarisAttach cbMaxBulkXfer=%d\n", pState->cbMaxBulkXfer)); /* @@ -617,5 +618,5 @@ } else - LogFlow((DEVICE_NAME ":VBoxUSBSolarisAttach not a USB device.\n")); /* This would appear on every boot if it were Rel */ + Log((DEVICE_NAME ":VBoxUSBSolarisAttach not a USB device.\n")); /* This would appear on every boot if it were Rel */ } else @@ -659,5 +660,5 @@ int VBoxUSBSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisDetach pDip=%p enmCmd=%d\n", pDip, enmCmd)); int instance = ddi_get_instance(pDip); @@ -784,5 +785,5 @@ int VBoxUSBSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppvResult) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisGetInfo\n")); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisGetInfo\n")); vboxusb_state_t *pState = NULL; @@ -833,5 +834,5 @@ LOCAL int vboxUSBSolarisSetConsumerCredentials(RTPROCESS Process, int Instance, void *pvReserved) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisSetConsumerCredentials Process=%u Instance=%d\n", Process, Instance)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisSetConsumerCredentials Process=%u Instance=%d\n", Process, Instance)); vboxusb_state_t *pState = ddi_get_soft_state(g_pVBoxUSBSolarisState, Instance); if (!pState) @@ -860,5 +861,5 @@ int VBoxUSBSolarisOpen(dev_t *pDev, int fFlag, int fType, cred_t *pCred) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisOpen pDev=%p fFlag=%d fType=%d pCred=%p\n", pDev, fFlag, fType, pCred)); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisOpen pDev=%p fFlag=%d fType=%d pCred=%p\n", pDev, fFlag, fType, pCred)); /* @@ -908,5 +909,5 @@ int VBoxUSBSolarisClose(dev_t Dev, int fFlag, int fType, cred_t *pCred) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisClose Dev=%d fFlag=%d fType=%d pCred=%p\n", Dev, fFlag, fType, pCred)); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisClose Dev=%d fFlag=%d fType=%d pCred=%p\n", Dev, fFlag, fType, pCred)); int instance = getminor((dev_t)Dev); @@ -929,5 +930,5 @@ int VBoxUSBSolarisRead(dev_t Dev, struct uio *pUio, cred_t *pCred) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisRead\n")); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisRead\n")); return ENOTSUP; } @@ -936,5 +937,5 @@ int VBoxUSBSolarisWrite(dev_t Dev, struct uio *pUio, cred_t *pCred) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisWrite\n")); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisWrite\n")); return ENOTSUP; } @@ -943,5 +944,5 @@ int VBoxUSBSolarisPoll(dev_t Dev, short fEvents, int fAnyYet, short *pReqEvents, struct pollhead **ppPollHead) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisPoll Dev=%d fEvents=%d fAnyYet=%d pReqEvents=%p\n", Dev, fEvents, fAnyYet, pReqEvents)); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisPoll Dev=%d fEvents=%d fAnyYet=%d pReqEvents=%p\n", Dev, fEvents, fAnyYet, pReqEvents)); /* @@ -991,5 +992,5 @@ int VBoxUSBSolarisPower(dev_info_t *pDip, int Component, int Level) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisPower pDip=%p Component=%d Level=%d\n", pDip, Component, Level)); + LogFunc((DEVICE_NAME ":VBoxUSBSolarisPower pDip=%p Component=%d Level=%d\n", pDip, Component, Level)); int instance = ddi_get_instance(pDip); @@ -1049,5 +1050,5 @@ } else - LogFlow((DEVICE_NAME ":USB_DEV_PWRSTATE_OK failed.\n")); + Log((DEVICE_NAME ":USB_DEV_PWRSTATE_OK failed.\n")); } else @@ -1070,5 +1071,5 @@ int VBoxUSBSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int Mode, cred_t *pCred, int *pVal) { -/* LogFlowFunc((DEVICE_NAME ":VBoxUSBSolarisIOCtl Dev=%d Cmd=%d pArg=%p Mode=%d\n", Dev, Cmd, pArg)); */ +/* LogFunc((DEVICE_NAME ":VBoxUSBSolarisIOCtl Dev=%d Cmd=%d pArg=%p Mode=%d\n", Dev, Cmd, pArg)); */ /* @@ -1198,5 +1199,5 @@ LOCAL int vboxUSBSolarisProcessIOCtl(int iFunction, void *pvState, int Mode, PVBOXUSBREQ pUSBReq, void *pvBuf, size_t *pcbDataOut) { -// LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl iFunction=%d pvState=%p pUSBReq=%p\n", iFunction, pvState, pUSBReq)); +// LogFunc((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl iFunction=%d pvState=%p pUSBReq=%p\n", iFunction, pvState, pUSBReq)); AssertPtrReturn(pvState, VERR_INVALID_PARAMETER); @@ -1229,5 +1230,5 @@ rc = vboxUSBSolarisSendURB(pState, pUrbReq, Mode); *pcbDataOut = 0; - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: SEND_URB returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: SEND_URB returned %d\n", rc)); break; } @@ -1240,5 +1241,5 @@ rc = vboxUSBSolarisReapURB(pState, pUrbReq, Mode); *pcbDataOut = sizeof(VBOXUSBREQ_URB); - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: REAP_URB returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: REAP_URB returned %d\n", rc)); break; } @@ -1251,5 +1252,5 @@ rc = vboxUSBSolarisClearEndPoint(pState, pClearEpReq->bEndpoint); *pcbDataOut = 0; - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: CLEAR_EP returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: CLEAR_EP returned %d\n", rc)); break; } @@ -1262,5 +1263,5 @@ rc = vboxUSBSolarisSetConfig(pState, pSetCfgReq->bConfigValue); *pcbDataOut = 0; - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: SET_CONFIG returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: SET_CONFIG returned %d\n", rc)); break; } @@ -1273,5 +1274,5 @@ rc = vboxUSBSolarisSetInterface(pState, pSetInterfaceReq->bInterface, pSetInterfaceReq->bAlternate); *pcbDataOut = 0; - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: SET_INTERFACE returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: SET_INTERFACE returned %d\n", rc)); break; } @@ -1284,5 +1285,5 @@ rc = vboxUSBSolarisCloseDevice(pState, pCloseDeviceReq->ResetLevel); *pcbDataOut = 0; - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: CLOSE_DEVICE returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: CLOSE_DEVICE returned %d\n", rc)); break; } @@ -1295,5 +1296,5 @@ rc = vboxUSBSolarisAbortPipe(pState, pAbortPipeReq->bEndpoint); *pcbDataOut = 0; - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: ABORT_PIPE returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: ABORT_PIPE returned %d\n", rc)); break; } @@ -1306,5 +1307,5 @@ rc = vboxUSBSolarisGetConfig(pState, &pGetCfgReq->bConfigValue); *pcbDataOut = sizeof(VBOXUSBREQ_GET_CONFIG); - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: GET_CONFIG returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: GET_CONFIG returned %d\n", rc)); break; } @@ -1319,5 +1320,5 @@ *pcbDataOut = sizeof(VBOXUSBREQ_GET_VERSION); rc = VINF_SUCCESS; - LogFlow((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: GET_VERSION returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisProcessIOCtl: GET_VERSION returned %d\n", rc)); break; } @@ -1346,5 +1347,5 @@ LOCAL int vboxUSBSolarisInitPower(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisInitPower pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisInitPower pState=%p\n", pState)); int rc = usb_handle_remote_wakeup(pState->pDip, USB_REMOTE_WAKEUP_ENABLE); @@ -1376,5 +1377,5 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisInitPower failed to create power components.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisInitPower failed to create power components.\n")); return VINF_SUCCESS; @@ -1385,5 +1386,5 @@ else { - LogFlow((DEVICE_NAME ":vboxUSBSolarisInitPower failed to enable remote wakeup. No PM.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisInitPower failed to enable remote wakeup. No PM.\n")); rc = VINF_SUCCESS; } @@ -1403,5 +1404,5 @@ LOCAL void vboxUSBSolarisDestroyPower(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDestroyPower pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDestroyPower pState=%p\n", pState)); if (pState->pPower) @@ -1418,9 +1419,9 @@ rc = pm_raise_power(pState->pDip, 0 /* component */, USB_DEV_OS_FULL_PWR); if (rc != DDI_SUCCESS) - LogFlow((DEVICE_NAME ":vboxUSBSolarisDestroyPower raising power failed! rc=%d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisDestroyPower raising power failed! rc=%d\n", rc)); rc = usb_handle_remote_wakeup(pState->pDip, USB_REMOTE_WAKEUP_DISABLE); if (rc != DDI_SUCCESS) - LogFlow((DEVICE_NAME ":vboxUSBSolarisDestroyPower failed to disable remote wakeup.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisDestroyPower failed to disable remote wakeup.\n")); } else @@ -1429,5 +1430,5 @@ rc = pm_lower_power(pState->pDip, 0 /* component */, USB_DEV_OS_PWR_OFF); if (rc != DDI_SUCCESS) - LogFlow((DEVICE_NAME ":vboxUSBSolarisDestroyPower lowering power failed! rc=%d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisDestroyPower lowering power failed! rc=%d\n", rc)); vboxUSBSolarisPowerIdle(pState); @@ -1555,8 +1556,8 @@ while (cCompatible--) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice compatible[%d]=%s\n", cCompatible, ppszCompatible[cCompatible])); + Log((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice compatible[%d]=%s\n", cCompatible, ppszCompatible[cCompatible])); if (!strncmp(ppszCompatible[cCompatible], "usb", 3)) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice verified device as USB. pszCompatible=%s\n", ppszCompatible[cCompatible])); + Log((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice verified device as USB. pszCompatible=%s\n", ppszCompatible[cCompatible])); ddi_prop_free(ppszCompatible); return true; @@ -1568,5 +1569,5 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice USB property lookup failed. rc=%d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice USB property lookup failed. rc=%d\n", rc)); /* @@ -1581,8 +1582,8 @@ while (cCompatible--) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice parent compatible[%d]=%s\n", cCompatible, ppszCompatible[cCompatible])); + Log((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice parent compatible[%d]=%s\n", cCompatible, ppszCompatible[cCompatible])); if (!strncmp(ppszCompatible[cCompatible], "usb", 3)) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice verified device as USB. parent pszCompatible=%s\n", + Log((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice verified device as USB. parent pszCompatible=%s\n", ppszCompatible[cCompatible])); ddi_prop_free(ppszCompatible); @@ -1595,8 +1596,8 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice USB parent property lookup failed. rc=%d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice USB parent property lookup failed. rc=%d\n", rc)); } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice failed to obtain parent device for property lookup.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsUSBDevice failed to obtain parent device for property lookup.\n")); return false; @@ -1619,5 +1620,5 @@ AssertPtrReturn(pEp, VERR_INVALID_POINTER); - /* LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisSendUrb pState=%p pUrbReq=%p bEndpoint=%#x[%d] enmDir=%#x enmType=%#x cbData=%d pvData=%p\n", + /* LogFunc((DEVICE_NAME ":vboxUSBSolarisSendUrb pState=%p pUrbReq=%p bEndpoint=%#x[%d] enmDir=%#x enmType=%#x cbData=%d pvData=%p\n", pState, pUrbReq, pUrbReq->bEndpoint, EndPtIndex, pUrbReq->enmDir, pUrbReq->enmType, pUrbReq->cbData, pUrbReq->pvData)); */ @@ -1776,5 +1777,5 @@ LOCAL int vboxUSBSolarisReapURB(vboxusb_state_t *pState, PVBOXUSBREQ_URB pUrbReq, int Mode) { -// LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisReapUrb pState=%p pUrbReq=%p\n", pState, pUrbReq)); +// LogFunc((DEVICE_NAME ":vboxUSBSolarisReapUrb pState=%p pUrbReq=%p\n", pState, pUrbReq)); AssertPtrReturn(pUrbReq, VERR_INVALID_POINTER); @@ -1848,5 +1849,5 @@ } - LogFlow((DEVICE_NAME ":vboxUSBSolarisReapUrb pvUrbR3=%p pvDataR3=%p cbData=%d\n", pUrbReq->pvUrbR3, pUrbReq->pvData, pUrbReq->cbData)); + Log((DEVICE_NAME ":vboxUSBSolarisReapUrb pvUrbR3=%p pvDataR3=%p cbData=%d\n", pUrbReq->pvUrbR3, pUrbReq->pvData, pUrbReq->cbData)); } else @@ -1854,5 +1855,5 @@ pUrbReq->cbData = 0; rc = VERR_INVALID_POINTER; - LogFlow((DEVICE_NAME ":vboxUSBSolarisReapUrb missing pvDataR3!!\n")); + Log((DEVICE_NAME ":vboxUSBSolarisReapUrb missing pvDataR3!!\n")); } @@ -1877,5 +1878,5 @@ else { - LogFlow((DEVICE_NAME ":vboxUSBSolarisReapUrb missing message.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisReapUrb missing message.\n")); pUrbReq->cbData = 0; } @@ -1926,5 +1927,5 @@ mutex_exit(&pState->Mtx); - LogFlow((DEVICE_NAME ":vboxUSBSolarisReapUrb returns %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisReapUrb returns %d\n", rc)); return rc; } @@ -1941,5 +1942,5 @@ LOCAL int vboxUSBSolarisClearEndPoint(vboxusb_state_t *pState, uint8_t bEndpoint) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisClearEndPoint pState=%p bEndpoint=%#x\n", pState, bEndpoint)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisClearEndPoint pState=%p bEndpoint=%#x\n", pState, bEndpoint)); /* @@ -1979,5 +1980,5 @@ mutex_enter(&pState->Mtx); - LogFlow((DEVICE_NAME ":vboxUSBSolarisClearEndPoint bEndpoint=%#x[%d] returns %d\n", bEndpoint, EndPtIndex, rc)); + Log((DEVICE_NAME ":vboxUSBSolarisClearEndPoint bEndpoint=%#x[%d] returns %d\n", bEndpoint, EndPtIndex, rc)); rc = VINF_SUCCESS; @@ -1985,5 +1986,5 @@ else { - LogFlow((DEVICE_NAME ":vboxUSBSolarisClearEndPoint not opened to be cleared. Faking success. bEndpoint=%#x.\n", bEndpoint)); + Log((DEVICE_NAME ":vboxUSBSolarisClearEndPoint not opened to be cleared. Faking success. bEndpoint=%#x.\n", bEndpoint)); rc = VINF_SUCCESS; } @@ -1996,5 +1997,5 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisClearEndPoint device state=%d not online.\n", pState->DevState)); + Log((DEVICE_NAME ":vboxUSBSolarisClearEndPoint device state=%d not online.\n", pState->DevState)); mutex_exit(&pState->Mtx); @@ -2013,5 +2014,5 @@ LOCAL int vboxUSBSolarisSetConfig(vboxusb_state_t *pState, uint8_t bCfgValue) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisSetConfig pState=%p bCfgValue=%#x\n", pState, bCfgValue)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisSetConfig pState=%p bCfgValue=%#x\n", pState, bCfgValue)); /* @@ -2070,5 +2071,5 @@ LOCAL int vboxUSBSolarisGetConfig(vboxusb_state_t *pState, uint8_t *pCfgValue) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisGetConfig pState=%p pCfgValue=%p\n", pState, pCfgValue)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisGetConfig pState=%p pCfgValue=%p\n", pState, pCfgValue)); AssertPtrReturn(pCfgValue, VERR_INVALID_POINTER); @@ -2085,5 +2086,5 @@ { *pCfgValue = pCurrCfg->cfg_descr.bConfigurationValue; - LogFlow((DEVICE_NAME ":vboxUSBSolarisGetConfig cached config returned. CfgValue=%d\n", *pCfgValue)); + Log((DEVICE_NAME ":vboxUSBSolarisGetConfig cached config returned. CfgValue=%d\n", *pCfgValue)); return VINF_SUCCESS; } @@ -2106,5 +2107,5 @@ } - LogFlow((DEVICE_NAME ":vboxUSBSolarisGetConfig returns %d CfgValue=%d\n", rc, *pCfgValue)); + Log((DEVICE_NAME ":vboxUSBSolarisGetConfig returns %d CfgValue=%d\n", rc, *pCfgValue)); return rc; } @@ -2122,5 +2123,5 @@ LOCAL int vboxUSBSolarisSetInterface(vboxusb_state_t *pState, uint8_t uInterface, uint8_t uAlt) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisSetInterface pState=%p uInterface=%#x uAlt=%#x\n", pState, uInterface, uAlt)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisSetInterface pState=%p uInterface=%#x uAlt=%#x\n", pState, uInterface, uAlt)); /* @@ -2169,5 +2170,5 @@ LOCAL int vboxUSBSolarisCloseDevice(vboxusb_state_t *pState, VBOXUSB_RESET_LEVEL enmReset) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisCloseDevice pState=%p enmReset=%d\n", pState, enmReset)); + Log((DEVICE_NAME ":vboxUSBSolarisCloseDevice pState=%p enmReset=%d\n", pState, enmReset)); /* @@ -2208,5 +2209,5 @@ } - LogFlow((DEVICE_NAME ":vboxUSBSolarisCloseDevice returns %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisCloseDevice returns %d\n", rc)); return rc; } @@ -2223,5 +2224,5 @@ LOCAL int vboxUSBSolarisAbortPipe(vboxusb_state_t *pState, uint8_t bEndpoint) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisAbortPipe pState=%p bEndpoint=%#x\n", pState, bEndpoint)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisAbortPipe pState=%p bEndpoint=%#x\n", pState, bEndpoint)); /* @@ -2268,5 +2269,5 @@ mutex_enter(&pState->Mtx); - LogFlow((DEVICE_NAME ":usb_pipe_drain_reqs returns %d\n", rc)); + Log((DEVICE_NAME ":usb_pipe_drain_reqs returns %d\n", rc)); rc = vboxUSBSolarisToVBoxRC(rc); } @@ -2286,5 +2287,5 @@ mutex_exit(&pState->Mtx); - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisAbortPipe returns %d\n", rc)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisAbortPipe returns %d\n", rc)); return rc; } @@ -2306,5 +2307,5 @@ uchar_t uInterface, uchar_t uAlt) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPoint pState=%p pEpData=%p CfgVal=%d Iface=%d Alt=%d", pState, + LogFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPoint pState=%p pEpData=%p CfgVal=%d Iface=%d Alt=%d", pState, pEpData, uCfgValue, uInterface, uAlt)); @@ -2350,5 +2351,5 @@ pEp->fInitialized = VBOXUSB_EP_INITIALIZED; } - LogFlow((DEVICE_NAME ":vboxUSBSolarisInitEndPoint done. %s:[%d] bEndpoint=%#x\n", !pEpData ? "Default " : "Endpoint", + Log((DEVICE_NAME ":vboxUSBSolarisInitEndPoint done. %s:[%d] bEndpoint=%#x\n", !pEpData ? "Default " : "Endpoint", EpIndex, pEp->EpDesc.bEndpointAddress)); return VINF_SUCCESS; @@ -2365,5 +2366,5 @@ LOCAL int vboxUSBSolarisInitAllEndPoints(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisInitAllEndPoints pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisInitAllEndPoints pState=%p\n", pState)); /* @@ -2404,5 +2405,5 @@ LOCAL int vboxUSBSolarisInitEndPointsForConfig(vboxusb_state_t *pState, uint8_t uCfgIndex) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPointsForConfig pState=%p uCfgIndex=%d\n", pState, uCfgIndex)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPointsForConfig pState=%p uCfgIndex=%d\n", pState, uCfgIndex)); usb_cfg_data_t *pConfig = &pState->pDevDesc->dev_cfg[uCfgIndex]; uchar_t uCfgValue = pConfig->cfg_descr.bConfigurationValue; @@ -2445,5 +2446,5 @@ LOCAL int vboxUSBSolarisInitEndPointsForInterfaceAlt(vboxusb_state_t *pState, uint8_t uInterface, uint8_t uAlt) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPointsForInterfaceAlt pState=%p uInterface=%d uAlt=%d\n", pState, uInterface, uAlt)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisInitEndPointsForInterfaceAlt pState=%p uInterface=%d uAlt=%d\n", pState, uInterface, uAlt)); /* Doesn't hurt to be paranoid */ @@ -2489,5 +2490,5 @@ } - LogFlow((DEVICE_NAME ":vboxUSBSolarisInitEndPointsForInterfaceAlt returns %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisInitEndPointsForInterfaceAlt returns %d\n", rc)); return rc; } @@ -2503,5 +2504,5 @@ LOCAL void vboxUSBSolarisDestroyAllEndPoints(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDestroyAllEndPoints pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDestroyAllEndPoints pState=%p\n", pState)); for (unsigned i = 0; i < VBOXUSB_MAX_ENDPOINTS; i++) { @@ -2524,5 +2525,5 @@ LOCAL void vboxUSBSolarisDestroyEndPoint(vboxusb_state_t *pState, vboxusb_ep_t *pEp) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDestroyEndPoint pState=%p pEp=%p\n", pState, pEp)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDestroyEndPoint pState=%p pEp=%p\n", pState, pEp)); if (pEp->fInitialized == VBOXUSB_EP_INITIALIZED) @@ -2563,5 +2564,5 @@ LOCAL void vboxUSBSolarisCloseAllPipes(vboxusb_state_t *pState, bool fDefault) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisCloseAllPipes pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisCloseAllPipes pState=%p\n", pState)); for (int i = 1; i < VBOXUSB_MAX_ENDPOINTS; i++) @@ -2571,5 +2572,5 @@ && pEp->pPipe) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisCloseAllPipes closing[%d]\n", i)); + Log((DEVICE_NAME ":vboxUSBSolarisCloseAllPipes closing[%d]\n", i)); vboxUSBSolarisClosePipe(pState, pEp); } @@ -2583,5 +2584,5 @@ { vboxUSBSolarisClosePipe(pState, pEp); - LogFlow((DEVICE_NAME ":vboxUSBSolarisCloseAllPipes closed default pipe.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisCloseAllPipes closed default pipe.\n")); } } @@ -2597,5 +2598,5 @@ LOCAL void vboxUSBSolarisCloseInterface(vboxusb_state_t *pState, uint8_t bInterface) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisCloseInterface pState=%p bInterface=%#x\n", pState, bInterface)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisCloseInterface pState=%p bInterface=%#x\n", pState, bInterface)); for (int i = 1; i < VBOXUSB_MAX_ENDPOINTS; i++) @@ -2606,5 +2607,5 @@ && pEp->uInterface == bInterface) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisCloseInterface closing[%d]\n", i)); + Log((DEVICE_NAME ":vboxUSBSolarisCloseInterface closing[%d]\n", i)); vboxUSBSolarisClosePipe(pState, pEp); } @@ -2623,5 +2624,5 @@ LOCAL int vboxUSBSolarisOpenPipe(vboxusb_state_t *pState, vboxusb_ep_t *pEp) { -// LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisOpenPipe pState=%p pEp=%p\n", pState, pEp)); +// LogFunc((DEVICE_NAME ":vboxUSBSolarisOpenPipe pState=%p pEp=%p\n", pState, pEp)); /* @@ -2638,5 +2639,5 @@ pEp->pPipe = pState->pDevDesc->dev_default_ph; pEp->EpState |= VBOXUSB_EP_STATE_OPENED; - LogFlow((DEVICE_NAME ":vboxUSBSolarisOpenPipe default pipe opened.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisOpenPipe default pipe opened.\n")); return VINF_SUCCESS; } @@ -2672,5 +2673,5 @@ pEp->cbMaxIsocData = 400 * cbMax * 8; } - LogFlow((DEVICE_NAME ":vboxUSBSolarisOpenPipe pEp=%p cbMaxIsocData=%u\n", pEp->cbMaxIsocData)); + Log((DEVICE_NAME ":vboxUSBSolarisOpenPipe pEp=%p cbMaxIsocData=%u\n", pEp->cbMaxIsocData)); } @@ -2698,5 +2699,5 @@ LOCAL void vboxUSBSolarisClosePipe(vboxusb_state_t *pState, vboxusb_ep_t *pEp) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisClosePipe pState=%p pEp=%p\n", pState, pEp)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisClosePipe pState=%p pEp=%p\n", pState, pEp)); AssertPtr(pEp); @@ -2713,5 +2714,5 @@ usb_pipe_drain_reqs(pState->pDip, pEp->pPipe, 0, USB_FLAGS_SLEEP, NULL /* callback */, NULL /* callback arg. */); mutex_enter(&pState->Mtx); - LogFlow((DEVICE_NAME ":vboxUSBSolarisClosePipe closed default pipe\n")); + Log((DEVICE_NAME ":vboxUSBSolarisClosePipe closed default pipe\n")); } else @@ -2731,5 +2732,5 @@ * Non-default pipe: close it. */ - LogFlow((DEVICE_NAME ":vboxUSBSolarisClosePipe pipe bmAttributes=%#x bEndpointAddress=%#x\n", pEp->EpDesc.bmAttributes, pEp->EpDesc.bEndpointAddress)); + Log((DEVICE_NAME ":vboxUSBSolarisClosePipe pipe bmAttributes=%#x bEndpointAddress=%#x\n", pEp->EpDesc.bmAttributes, pEp->EpDesc.bEndpointAddress)); mutex_exit(&pState->Mtx); usb_pipe_close(pState->pDip, pEp->pPipe, USB_FLAGS_SLEEP, NULL /* callback */, NULL /* callback arg. */); @@ -2742,5 +2743,5 @@ pEp->pPipe = NULL; - LogFlow((DEVICE_NAME ":vboxUSBSolarisClosePipe successful. pEp=%p\n", pEp)); + Log((DEVICE_NAME ":vboxUSBSolarisClosePipe successful. pEp=%p\n", pEp)); } @@ -2758,5 +2759,5 @@ LOCAL bool vboxUSBSolarisIsAnyPipeOpen(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p\n", pState)); for (int i = 1; i < VBOXUSB_MAX_ENDPOINTS; i++) @@ -2765,10 +2766,10 @@ if (pEp->pPipe) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p pEp=%p returns true.\n", pState, pEp)); + Log((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p pEp=%p returns true.\n", pState, pEp)); return true; } } - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p returns false.\n", pState)); + Log((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p returns false.\n", pState)); return false; } @@ -2852,5 +2853,5 @@ LOCAL vboxusb_urb_t *vboxUSBSolarisQueueURB(vboxusb_state_t *pState, PVBOXUSBREQ_URB pUrbReq, mblk_t *pMsg) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisQueueURB pState=%p pUrbReq=%p\n", pState, pUrbReq)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisQueueURB pState=%p pUrbReq=%p\n", pState, pUrbReq)); mutex_enter(&pState->Mtx); @@ -2905,5 +2906,5 @@ Assert(pUrb->pMsg == NULL); pUrb->pState = pState; - LogFlow((DEVICE_NAME ":vboxUSBSolarisQueueURB cInflightUrbs=%d\n", pState->cInflightUrbs)); + Log((DEVICE_NAME ":vboxUSBSolarisQueueURB cInflightUrbs=%d\n", pState->cInflightUrbs)); if (RT_LIKELY(pUrbReq)) @@ -2940,5 +2941,5 @@ LOCAL inline void vboxUSBSolarisDeQueueURB(vboxusb_urb_t *pUrb, int URBStatus) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDeQueue pUrb=%p\n", pUrb)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDeQueue pUrb=%p\n", pUrb)); AssertPtrReturnVoid(pUrb); @@ -2963,5 +2964,5 @@ else { - LogFlow((DEVICE_NAME ":vboxUSBSolarisDeQueue State Gone.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisDeQueue State Gone.\n")); freemsg(pUrb->pMsg); pUrb->pMsg = NULL; @@ -3044,5 +3045,5 @@ LOCAL int vboxUSBSolarisCtrlXfer(vboxusb_state_t *pState, vboxusb_ep_t *pEp, vboxusb_urb_t *pUrb) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisCtrlXfer pState=%p pEp=%p pUrb=%p enmDir=%d cbData=%d\n", pState, pEp, pUrb, pUrb->enmDir, pUrb->cbDataR3)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisCtrlXfer pState=%p pEp=%p pUrb=%p enmDir=%d cbData=%d\n", pState, pEp, pUrb, pUrb->enmDir, pUrb->cbDataR3)); AssertPtrReturn(pUrb->pMsg, VERR_INVALID_PARAMETER); @@ -3092,5 +3093,5 @@ pReq->ctrl_client_private = (usb_opaque_t)pUrb; - LogFlow((DEVICE_NAME ":vboxUSBSolarisCtrlXfer %.*Rhxd\n", VBOXUSB_CTRL_XFER_SIZE, pSetupData)); + Log((DEVICE_NAME ":vboxUSBSolarisCtrlXfer %.*Rhxd\n", VBOXUSB_CTRL_XFER_SIZE, pSetupData)); /* @@ -3127,5 +3128,5 @@ LOCAL void vboxUSBSolarisCtrlXferCompleted(usb_pipe_handle_t pPipe, usb_ctrl_req_t *pReq) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisCtrlXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisCtrlXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); vboxusb_urb_t *pUrb = (vboxusb_urb_t *)pReq->ctrl_client_private; @@ -3158,7 +3159,7 @@ && pUrb->pMsg->b_cont == NULL) /* Concat succeeded */ { - LogFlow((DEVICE_NAME ":vboxUSBSolarisCtrlXferCompleted prepended header rc=%d cbData=%d.\n", pReq->ctrl_completion_reason, + Log((DEVICE_NAME ":vboxUSBSolarisCtrlXferCompleted prepended header rc=%d cbData=%d.\n", pReq->ctrl_completion_reason, MBLKL(pUrb->pMsg))); - LogFlow((DEVICE_NAME ":%.*Rhxd\n", MBLKL(pUrb->pMsg), pUrb->pMsg->b_rptr)); + Log((DEVICE_NAME ":%.*Rhxd\n", MBLKL(pUrb->pMsg), pUrb->pMsg->b_rptr)); } #endif @@ -3193,5 +3194,5 @@ LOCAL int vboxUSBSolarisBulkXfer(vboxusb_state_t *pState, vboxusb_ep_t *pEp, vboxusb_urb_t *pUrb) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisBulkXfer pState=%p pEp=%p pUrb=%p enmDir=%d cbData=%d\n", pState, pEp, pUrb, pUrb->enmDir, pUrb->cbDataR3)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisBulkXfer pState=%p pEp=%p pUrb=%p enmDir=%d cbData=%d\n", pState, pEp, pUrb, pUrb->enmDir, pUrb->cbDataR3)); /* @@ -3258,5 +3259,5 @@ LOCAL void vboxUSBSolarisBulkXferCompleted(usb_pipe_handle_t pPipe, usb_bulk_req_t *pReq) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisBulkXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisBulkXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); vboxusb_ep_t *pEp = (vboxusb_ep_t *)usb_pipe_get_private(pPipe); @@ -3278,5 +3279,5 @@ } - LogFlow((DEVICE_NAME ":vboxUSBSolarisBulkXferCompleted %s. rc=%d cbData=%d\n", + Log((DEVICE_NAME ":vboxUSBSolarisBulkXferCompleted %s. rc=%d cbData=%d\n", pReq->bulk_completion_reason != USB_CR_OK ? "failed URB" : "success", pReq->bulk_completion_reason, pUrb->pMsg ? MBLKL(pUrb->pMsg) : 0)); @@ -3293,5 +3294,5 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisBulkXferCompleted Pipe Gone.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisBulkXferCompleted Pipe Gone.\n")); usb_free_bulk_req(pReq); @@ -3311,5 +3312,5 @@ LOCAL int vboxUSBSolarisIntrXfer(vboxusb_state_t *pState, vboxusb_ep_t *pEp, vboxusb_urb_t *pUrb) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisIntrXfer pState=%p pEp=%p pUrb=%p enmDir=%d cbData=%d\n", pState, pEp, pUrb, pUrb->enmDir, pUrb->cbDataR3)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisIntrXfer pState=%p pEp=%p pUrb=%p enmDir=%d cbData=%d\n", pState, pEp, pUrb, pUrb->enmDir, pUrb->cbDataR3)); int rc = VINF_SUCCESS; @@ -3371,5 +3372,5 @@ LOCAL void vboxUSBSolarisIntrXferCompleted(usb_pipe_handle_t pPipe, usb_intr_req_t *pReq) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisIntrXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisIntrXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); vboxusb_ep_t *pEp = (vboxusb_ep_t *)usb_pipe_get_private(pPipe); @@ -3390,5 +3391,5 @@ } - LogFlow((DEVICE_NAME ":vboxUSBSolarisIntrXferCompleted rc=%d pMsg=%p enmDir=%#x\n", pReq->intr_completion_reason, pUrb->pMsg, + Log((DEVICE_NAME ":vboxUSBSolarisIntrXferCompleted rc=%d pMsg=%p enmDir=%#x\n", pReq->intr_completion_reason, pUrb->pMsg, pUrb->enmDir)); @@ -3404,5 +3405,5 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisIntrXferCompleted Pipe Gone.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIntrXferCompleted Pipe Gone.\n")); usb_free_intr_req(pReq); @@ -3422,5 +3423,5 @@ LOCAL int vboxUSBSolarisIsocXfer(vboxusb_state_t *pState, vboxusb_ep_t *pEp, vboxusb_urb_t *pUrb) { -// LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisIsocXfer pState=%p pEp=%p pUrb=%p\n", pState, pEp, pUrb)); +// LogFunc((DEVICE_NAME ":vboxUSBSolarisIsocXfer pState=%p pEp=%p pUrb=%p\n", pState, pEp, pUrb)); /* @@ -3431,5 +3432,5 @@ if (pUrb->enmDir == VUSBDIRECTION_IN) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocXfer Isoc. In queueing.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocXfer Isoc. In queueing.\n")); mutex_enter(&pState->Mtx); @@ -3442,5 +3443,5 @@ { mutex_exit(&pState->Mtx); - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocXfer Max Isoc. data %d bytes queued\n", pEp->cbMaxIsocData)); + Log((DEVICE_NAME ":vboxUSBSolarisIsocXfer Max Isoc. data %d bytes queued\n", pEp->cbMaxIsocData)); return VERR_TOO_MUCH_DATA; } @@ -3457,5 +3458,5 @@ int rc = VINF_SUCCESS; usb_isoc_req_t *pReq = usb_alloc_isoc_req(pState->pDip, pUrb->cIsocPkts, cbData, USB_FLAGS_NOSLEEP); - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocXfer enmDir=%#x cIsocPkts=%d aIsocPkts[0]=%d cbDataR3=%d\n", pUrb->enmDir, + Log((DEVICE_NAME ":vboxUSBSolarisIsocXfer enmDir=%#x cIsocPkts=%d aIsocPkts[0]=%d cbDataR3=%d\n", pUrb->enmDir, pUrb->cIsocPkts, pUrb->aIsocPkts[0].cbPkt, pUrb->cbDataR3)); if (RT_LIKELY(pReq)) @@ -3549,5 +3550,5 @@ LOCAL void vboxUSBSolarisIsocInXferCompleted(usb_pipe_handle_t pPipe, usb_isoc_req_t *pReq) { -// LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); +// LogFunc((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); vboxusb_state_t *pState = (vboxusb_state_t *)pReq->isoc_client_private; @@ -3564,5 +3565,5 @@ if (pReq->isoc_error_count == pReq->isoc_pkts_count) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted stopping polling! Too many errors.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted stopping polling! Too many errors.\n")); mutex_exit(&pState->Mtx); usb_pipe_stop_isoc_polling(pPipe, USB_FLAGS_NOSLEEP); @@ -3576,5 +3577,5 @@ if (RT_LIKELY(pReq->isoc_data)) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted cIsocInUrbs=%d cbIsocInLandedReqs=%d\n", pEp->cIsocInUrbs, pEp->cbIsocInLandedReqs)); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted cIsocInUrbs=%d cbIsocInLandedReqs=%d\n", pEp->cIsocInUrbs, pEp->cbIsocInLandedReqs)); mutex_enter(&pState->Mtx); @@ -3641,5 +3642,5 @@ * Buffer incoming data if the guest has not yet queued any Input URBs. */ - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted Buffering\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted Buffering\n")); vboxusb_isoc_req_t *pIsocReq = kmem_alloc(sizeof(vboxusb_isoc_req_t), KM_NOSLEEP); if (RT_LIKELY(pIsocReq)) @@ -3723,5 +3724,5 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted State Gone.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferCompleted State Gone.\n")); usb_free_isoc_req(pReq); @@ -3738,10 +3739,10 @@ LOCAL void vboxUSBSolarisIsocInXferError(usb_pipe_handle_t pPipe, usb_isoc_req_t *pReq) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisIsocInXferError pPipe=%p pReq=%p\n", pPipe, pReq)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisIsocInXferError pPipe=%p pReq=%p\n", pPipe, pReq)); vboxusb_state_t *pState = (vboxusb_state_t *)pReq->isoc_client_private; if (RT_UNLIKELY(!pState)) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferError State Gone.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferError State Gone.\n")); usb_free_isoc_req(pReq); return; @@ -3752,5 +3753,5 @@ if (RT_UNLIKELY(!pEp)) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferError Pipe Gone.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferError Pipe Gone.\n")); mutex_exit(&pState->Mtx); usb_free_isoc_req(pReq); @@ -3768,5 +3769,5 @@ mutex_exit(&pState->Mtx); usb_pipe_isoc_xfer(pPipe, pReq, USB_FLAGS_NOSLEEP); - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferError resubmitted Isoc. IN request due to immediately unavailable resources.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferError resubmitted Isoc. IN request due to immediately unavailable resources.\n")); return; @@ -3784,5 +3785,5 @@ default: { - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferError stopping Isoc. In. polling due to rc=%d\n", pReq->isoc_completion_reason)); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferError stopping Isoc. In. polling due to rc=%d\n", pReq->isoc_completion_reason)); pEp->fIsocPolling = false; mutex_exit(&pState->Mtx); @@ -3801,5 +3802,5 @@ { --pEp->cIsocInUrbs; - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocInXferError Deleting last queued URB as it failed.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocInXferError Deleting last queued URB as it failed.\n")); freemsg(pUrb->pMsg); RTMemFree(pUrb); @@ -3820,5 +3821,5 @@ LOCAL void vboxUSBSolarisIsocOutXferCompleted(usb_pipe_handle_t pPipe, usb_isoc_req_t *pReq) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted pPipe=%p pReq=%p\n", pPipe, pReq)); vboxusb_ep_t *pEp = (vboxusb_ep_t *)usb_pipe_get_private(pPipe); @@ -3836,5 +3837,5 @@ } - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted cIsocPkts=%d cbData=%d cbActPkt=%d\n", pUrb->cIsocPkts, pUrb->cbDataR3, cbActPkt)); + Log((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted cIsocPkts=%d cbData=%d cbActPkt=%d\n", pUrb->cIsocPkts, pUrb->cbDataR3, cbActPkt)); if (pReq->isoc_completion_reason == USB_CR_OK) @@ -3859,8 +3860,8 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted missing private data!?! Dropping OUT pUrb.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted missing private data!?! Dropping OUT pUrb.\n")); } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted Pipe Gone.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisIsocOutXferCompleted Pipe Gone.\n")); usb_free_isoc_req(pReq); @@ -3877,5 +3878,5 @@ LOCAL int vboxUSBSolarisDeviceDisconnected(dev_info_t *pDip) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDeviceDisconnected pDip=%p\n", pDip)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDeviceDisconnected pDip=%p\n", pDip)); int instance = ddi_get_instance(pDip); @@ -3915,5 +3916,5 @@ LOCAL int vboxUSBSolarisDeviceReconnected(dev_info_t *pDip) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDeviceReconnected pDip=%p\n", pDip)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDeviceReconnected pDip=%p\n", pDip)); int instance = ddi_get_instance(pDip); @@ -3938,5 +3939,5 @@ LOCAL void vboxUSBSolarisDeviceRestore(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDeviceRestore pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDeviceRestore pState=%p\n", pState)); AssertPtrReturnVoid(pState); @@ -3965,5 +3966,5 @@ /* Do we need to inform userland here? */ vboxUSBSolarisPowerIdle(pState); - LogFlow((DEVICE_NAME ":vboxUSBSolarisDeviceRestore not the same device.\n")); + Log((DEVICE_NAME ":vboxUSBSolarisDeviceRestore not the same device.\n")); return; } @@ -3996,5 +3997,5 @@ LOCAL int vboxUSBSolarisDeviceSuspend(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDeviceSuspend pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDeviceSuspend pState=%p\n", pState)); int rc = VERR_VUSB_DEVICE_IS_SUSPENDED; @@ -4061,5 +4062,5 @@ mutex_exit(&pState->Mtx); - LogFlow((DEVICE_NAME ":vboxUSBSolarisDeviceSuspend returns %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisDeviceSuspend returns %d\n", rc)); return rc; } @@ -4073,5 +4074,5 @@ LOCAL void vboxUSBSolarisDeviceResume(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisDeviceResume pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisDeviceResume pState=%p\n", pState)); return vboxUSBSolarisDeviceRestore(pState); } @@ -4085,5 +4086,5 @@ LOCAL void vboxUSBSolarisPowerBusy(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisPowerBusy pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisPowerBusy pState=%p\n", pState)); AssertPtrReturnVoid(pState); @@ -4097,5 +4098,5 @@ if (rc != DDI_SUCCESS) { - LogFlow((DEVICE_NAME ":vboxUSBSolarisPowerBusy busy component failed! rc=%d\n", rc)); + Log((DEVICE_NAME ":vboxUSBSolarisPowerBusy busy component failed! rc=%d\n", rc)); mutex_enter(&pState->Mtx); pState->pPower->PowerBusy--; @@ -4115,5 +4116,5 @@ LOCAL void vboxUSBSolarisPowerIdle(vboxusb_state_t *pState) { - LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisPowerIdle pState=%p\n", pState)); + LogFunc((DEVICE_NAME ":vboxUSBSolarisPowerIdle pState=%p\n", pState)); AssertPtrReturnVoid(pState); @@ -4129,6 +4130,6 @@ } else - LogFlow((DEVICE_NAME ":vboxUSBSolarisPowerIdle idle component failed! rc=%d\n", rc)); - } -} - + Log((DEVICE_NAME ":vboxUSBSolarisPowerIdle idle component failed! rc=%d\n", rc)); + } +} + Index: /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c (revision 38894) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c (revision 38895) @@ -21,4 +21,5 @@ #define LOG_GROUP LOG_GROUP_USB_DRV #ifdef DEBUG_ramshankar +# define LOG_ENABLED # define LOG_INSTANCE RTLogRelDefaultInstance() #endif @@ -193,5 +194,5 @@ int rc; - LogFlowFunc((DEVICE_NAME ":_init\n")); + LogFunc((DEVICE_NAME ":_init\n")); g_pDip = NULL; @@ -249,5 +250,5 @@ int rc; - LogFlowFunc((DEVICE_NAME ":_fini\n")); + LogFunc((DEVICE_NAME ":_fini\n")); rc = mod_remove(&g_VBoxUSBMonSolarisModLinkage); @@ -266,5 +267,5 @@ int _info(struct modinfo *pModInfo) { - LogFlowFunc((DEVICE_NAME ":_info\n")); + LogFunc((DEVICE_NAME ":_info\n")); return mod_info(&g_VBoxUSBMonSolarisModLinkage, pModInfo); @@ -282,5 +283,5 @@ static int VBoxUSBMonSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd)); switch (enmCmd) { @@ -329,5 +330,5 @@ static int VBoxUSBMonSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisDetach\n")); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisDetach\n")); switch (enmCmd) @@ -379,5 +380,5 @@ int rc = DDI_SUCCESS; - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisGetInfo\n")); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisGetInfo\n")); switch (enmCmd) @@ -404,5 +405,5 @@ unsigned iOpenInstance; - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisOpen\n")); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisOpen\n")); /* @@ -431,5 +432,5 @@ return EINVAL; } - LogFlow((DEVICE_NAME ":Successfully registered election callback with USBA\n")); + Log((DEVICE_NAME ":Successfully registered election callback with USBA\n")); mutex_enter(&g_VBoxUSBMonSolarisMtx); } @@ -469,5 +470,5 @@ vboxusbmon_state_t *pState = NULL; - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisClose\n")); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisClose\n")); pState = ddi_get_soft_state(g_pVBoxUSBMonSolarisState, getminor(Dev)); @@ -486,5 +487,5 @@ mutex_exit(&g_VBoxUSBMonSolarisMtx); usb_unregister_dev_driver(g_pDip); - LogFlow((DEVICE_NAME ":Successfully deregistered driver election callback\n")); + Log((DEVICE_NAME ":Successfully deregistered driver election callback\n")); } else @@ -515,5 +516,5 @@ static int VBoxUSBMonSolarisRead(dev_t Dev, struct uio *pUio, cred_t *pCred) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisRead\n")); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisRead\n")); return 0; } @@ -522,5 +523,5 @@ static int VBoxUSBMonSolarisWrite(dev_t Dev, struct uio *pUio, cred_t *pCred) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisWrite\n")); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisWrite\n")); return 0; } @@ -537,5 +538,5 @@ static int VBoxUSBMonSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int Mode, cred_t *pCred, int *pVal) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisIOCtl Dev=%d Cmd=%d pArg=%p Mode=%d\n", Dev, Cmd, pArg)); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisIOCtl Dev=%d Cmd=%d pArg=%p Mode=%d\n", Dev, Cmd, pArg)); /* @@ -603,5 +604,5 @@ return EINVAL; } - LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisIOCtl: pid=%d.\n", (int)RTProcSelf())); + Log((DEVICE_NAME ":VBoxUSBMonSolarisIOCtl: pid=%d.\n", (int)RTProcSelf())); /* @@ -665,5 +666,5 @@ static int vboxUSBMonSolarisProcessIOCtl(int iFunction, void *pvState, void *pvData, size_t cbData, size_t *pcbReturnedData) { - LogFlowFunc((DEVICE_NAME ":solarisUSBProcessIOCtl iFunction=%d pvBuf=%p cbBuf=%zu\n", iFunction, pvData, cbData)); + LogFunc((DEVICE_NAME ":solarisUSBProcessIOCtl iFunction=%d pvBuf=%p cbBuf=%zu\n", iFunction, pvData, cbData)); AssertPtrReturn(pvState, VERR_INVALID_POINTER); @@ -695,5 +696,5 @@ PUSBFILTER pFilter = (PUSBFILTER)&pReq->Filter; - LogFlow(("vboxUSBMonSolarisProcessIOCtl: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x\n", + Log(("vboxUSBMonSolarisProcessIOCtl: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x\n", USBFilterGetNum(pFilter, USBFILTERIDX_VENDOR_ID), USBFilterGetNum(pFilter, USBFILTERIDX_PRODUCT_ID), @@ -704,5 +705,5 @@ USBFilterGetNum(pFilter, USBFILTERIDX_BUS), USBFilterGetNum(pFilter, USBFILTERIDX_PORT))); - LogFlow(("vboxUSBMonSolarisProcessIOCtl: Manufacturer=%s Product=%s Serial=%s\n", + Log(("vboxUSBMonSolarisProcessIOCtl: Manufacturer=%s Product=%s Serial=%s\n", USBFilterGetString(pFilter, USBFILTERIDX_MANUFACTURER_STR) ? USBFilterGetString(pFilter, USBFILTERIDX_MANUFACTURER_STR) : "", USBFilterGetString(pFilter, USBFILTERIDX_PRODUCT_STR) ? USBFilterGetString(pFilter, USBFILTERIDX_PRODUCT_STR) : "", @@ -713,5 +714,5 @@ rc = VBoxUSBFilterAdd(pFilter, pState->Process, &pReq->uId); *pcbReturnedData = cbData; - LogFlow((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: ADD_FILTER (Process:%d) returned %d\n", pState->Process, rc)); + Log((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: ADD_FILTER (Process:%d) returned %d\n", pState->Process, rc)); break; } @@ -724,5 +725,5 @@ rc = VBoxUSBFilterRemove(pState->Process, (uintptr_t)pReq->uId); *pcbReturnedData = 0; - LogFlow((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: REMOVE_FILTER (Process:%d) returned %d\n", pState->Process, rc)); + Log((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: REMOVE_FILTER (Process:%d) returned %d\n", pState->Process, rc)); break; } @@ -735,5 +736,5 @@ rc = vboxUSBMonSolarisResetDevice(pReq->szDevicePath, pReq->fReattach); *pcbReturnedData = 0; - LogFlow((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: RESET_DEVICE (Process:%d) returned %d\n", pState->Process, rc)); + Log((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: RESET_DEVICE (Process:%d) returned %d\n", pState->Process, rc)); break; } @@ -746,5 +747,5 @@ rc = vboxUSBMonSolarisClientInfo(pState, pReq); *pcbReturnedData = cbData; - LogFlow((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: CLIENT_INFO (Process:%d) returned %d\n", pState->Process, rc)); + Log((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: CLIENT_INFO (Process:%d) returned %d\n", pState->Process, rc)); break; } @@ -759,5 +760,5 @@ *pcbReturnedData = sizeof(VBOXUSBREQ_GET_VERSION); rc = VINF_SUCCESS; - LogFlow((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: GET_VERSION returned %d\n", rc)); + Log((DEVICE_NAME ":vboxUSBMonSolarisProcessIOCtl: GET_VERSION returned %d\n", rc)); break; } @@ -778,5 +779,5 @@ int rc = VERR_GENERAL_FAILURE; - LogFlowFunc((DEVICE_NAME ":vboxUSBMonSolarisResetDevice pszDevicePath=%s fReattach=%d\n", pszDevicePath, fReattach)); + LogFunc((DEVICE_NAME ":vboxUSBMonSolarisResetDevice pszDevicePath=%s fReattach=%d\n", pszDevicePath, fReattach)); /* @@ -811,5 +812,5 @@ */ rc = usb_reset_device(pDeviceInfo, fReattach ? USB_RESET_LVL_REATTACH : USB_RESET_LVL_DEFAULT); - LogFlow((DEVICE_NAME ":usb_reset_device for %s level=%s returned %d\n", pszDevicePath, fReattach ? "ReAttach" : "Default", rc)); + Log((DEVICE_NAME ":usb_reset_device for %s level=%s returned %d\n", pszDevicePath, fReattach ? "ReAttach" : "Default", rc)); switch (rc) { @@ -846,5 +847,5 @@ static int vboxUSBMonSolarisClientInfo(vboxusbmon_state_t *pState, PVBOXUSB_CLIENT_INFO pClientInfo) { - LogFlowFunc((DEVICE_NAME ":vboxUSBMonSolarisClientInfo pState=%p pClientInfo=%p\n", pState, pClientInfo)); + LogFunc((DEVICE_NAME ":vboxUSBMonSolarisClientInfo pState=%p pClientInfo=%p\n", pState, pClientInfo)); AssertPtrReturn(pState, VERR_INVALID_POINTER); @@ -876,5 +877,5 @@ mutex_exit(&g_VBoxUSBMonSolarisMtx); - LogFlow((DEVICE_NAME ":vboxUSBMonSolarisClientInfo found. %s rc=%d\n", pClientInfo->szDeviceIdent, rc)); + Log((DEVICE_NAME ":vboxUSBMonSolarisClientInfo found. %s rc=%d\n", pClientInfo->szDeviceIdent, rc)); return rc; } @@ -899,5 +900,5 @@ int VBoxUSBMonSolarisRegisterClient(dev_info_t *pClientDip, PVBOXUSB_CLIENT_INFO pClientInfo) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient pClientDip=%p pClientInfo=%p\n", pClientDip, pClientInfo)); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient pClientDip=%p pClientInfo=%p\n", pClientDip, pClientInfo)); AssertPtrReturn(pClientInfo, VERR_INVALID_PARAMETER); @@ -918,5 +919,5 @@ mutex_exit(&g_VBoxUSBMonSolarisMtx); - LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient registered. %d %s %s\n", + Log((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient registered. %d %s %s\n", pClient->Info.Instance, pClient->Info.szClientPath, pClient->Info.szDeviceIdent)); @@ -940,5 +941,5 @@ int VBoxUSBMonSolarisUnregisterClient(dev_info_t *pClientDip) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient pClientDip=%p\n", pClientDip)); + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient pClientDip=%p\n", pClientDip)); AssertReturn(pClientDip, VERR_INVALID_PARAMETER); @@ -960,5 +961,5 @@ mutex_exit(&g_VBoxUSBMonSolarisMtx); - LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient unregistered. %d %s %s\n", + Log((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient unregistered. %d %s %s\n", pCur->Info.Instance, pCur->Info.szClientPath, pCur->Info.szDeviceIdent)); RTMemFree(pCur); @@ -995,5 +996,5 @@ char **ppszDrv, void *pvReserved) { - LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisElectDriver pDevDesc=%p pDevStrings=%p pszDevicePath=%s Bus=%d Port=%d\n", pDevDesc, + LogFunc((DEVICE_NAME ":VBoxUSBMonSolarisElectDriver pDevDesc=%p pDevStrings=%p pszDevicePath=%s Bus=%d Port=%d\n", pDevDesc, pDevStrings, pszDevicePath, Bus, Port)); @@ -1021,5 +1022,5 @@ USBFilterSetMustBePresent(&Filter, USBFILTERIDX_BUS, false /* fMustBePresent */); - LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisElectDriver: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x\n", + Log((DEVICE_NAME ":VBoxUSBMonSolarisElectDriver: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_VENDOR_ID), USBFilterGetNum(&Filter, USBFILTERIDX_PRODUCT_ID), @@ -1030,5 +1031,5 @@ USBFilterGetNum(&Filter, USBFILTERIDX_BUS), USBFilterGetNum(&Filter, USBFILTERIDX_PORT))); - LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisElectDriver: Manufacturer=%s Product=%s Serial=%s\n", + Log((DEVICE_NAME ":VBoxUSBMonSolarisElectDriver: Manufacturer=%s Product=%s Serial=%s\n", USBFilterGetString(&Filter, USBFILTERIDX_MANUFACTURER_STR) ? USBFilterGetString(&Filter, USBFILTERIDX_MANUFACTURER_STR) : "", USBFilterGetString(&Filter, USBFILTERIDX_PRODUCT_STR) ? USBFilterGetString(&Filter, USBFILTERIDX_PRODUCT_STR) : "", @@ -1043,5 +1044,5 @@ if (Owner == NIL_RTPROCESS) { - LogFlow((DEVICE_NAME ":No matching filters, device %#x:%#x uninteresting.\n", pDevDesc->idVendor, pDevDesc->idProduct)); + Log((DEVICE_NAME ":No matching filters, device %#x:%#x uninteresting.\n", pDevDesc->idVendor, pDevDesc->idProduct)); return USB_FAILURE; }