Changeset 52618 in vbox for trunk/src/VBox/Devices
- Timestamp:
- Sep 5, 2014 12:07:29 PM (10 years ago)
- Location:
- trunk/src/VBox/Devices
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Bus/SrvPciRawR0.cpp
r44529 r52618 5 5 6 6 /* 7 * Copyright (C) 2011-201 2Oracle Corporation7 * Copyright (C) 2011-2014 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 115 115 RTSpinlockAcquire(pThis->hSpinlock); 116 116 pThis->iPendingIrq = iHostIrq; 117 RTSpinlockRelease NoInts(pThis->hSpinlock);117 RTSpinlockRelease(pThis->hSpinlock); 118 118 119 119 /** … … 872 872 pDev->iPendingIrq = 0; 873 873 fTerminate = pDev->fTerminate; 874 RTSpinlockRelease NoInts(pDev->hSpinlock);874 RTSpinlockRelease(pDev->hSpinlock); 875 875 876 876 /* Block until new IRQs arrives */ … … 888 888 iPendingIrq = pDev->iPendingIrq; 889 889 pDev->iPendingIrq = 0; 890 RTSpinlockRelease NoInts(pDev->hSpinlock);890 RTSpinlockRelease(pDev->hSpinlock); 891 891 } 892 892 else -
trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp
r52592 r52618 4 4 * 5 5 * @remarks No lazy code changes. If you don't understand exactly what you're 6 * doing, get an understand or forget it.6 * doing, get an understanding or forget it. 7 7 * All changes shall be reviewed by bird before commit. If not around, 8 8 * email and let Frank and/or Klaus OK the changes before committing. … … 1182 1182 } 1183 1183 1184 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1184 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1185 1185 } 1186 1186 … … 1215 1215 } 1216 1216 1217 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1217 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1218 1218 } 1219 1219 … … 1242 1242 { 1243 1243 intnetR0BusyIncIf(pIf); 1244 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1244 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1245 1245 return pIf; 1246 1246 } 1247 1247 } 1248 1248 1249 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1249 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1250 1250 return NULL; 1251 1251 } … … 1272 1272 { 1273 1273 /* This shouldn't happen*/ 1274 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1274 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1275 1275 return; 1276 1276 } … … 1313 1313 Assert(pCache->cEntries <= pCache->cEntriesAlloc); 1314 1314 1315 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1315 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1316 1316 } 1317 1317 … … 1570 1570 } 1571 1571 1572 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1572 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1573 1573 return pDstTab->cIfs 1574 1574 ? (!pDstTab->fTrunkDst ? INTNETSWDECISION_INTNET : INTNETSWDECISION_BROADCAST) … … 1631 1631 } 1632 1632 1633 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1633 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1634 1634 return enmSwDecision; 1635 1635 } … … 1744 1744 } 1745 1745 1746 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1746 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1747 1747 return pDstTab->cIfs 1748 1748 ? (!pDstTab->fTrunkDst ? INTNETSWDECISION_INTNET : INTNETSWDECISION_BROADCAST) … … 1806 1806 } 1807 1807 1808 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1808 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1809 1809 return INTNETSWDECISION_BROADCAST; 1810 1810 } … … 1867 1867 } 1868 1868 1869 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1869 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1870 1870 return !pDstTab->cIfs 1871 1871 ? (!pDstTab->fTrunkDst ? INTNETSWDECISION_DROP : INTNETSWDECISION_TRUNK) … … 1909 1909 } 1910 1910 1911 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);1911 RTSpinlockRelease(pNetwork->hAddrSpinlock); 1912 1912 return pDstTab->fTrunkDst ? INTNETSWDECISION_TRUNK : INTNETSWDECISION_DROP; 1913 1913 } … … 2003 2003 if (pvOld) 2004 2004 *ppDstTab = pNew; 2005 RTSpinlockRelease NoInts(pTrunk->hDstTabSpinlock);2005 RTSpinlockRelease(pTrunk->hDstTabSpinlock); 2006 2006 if (pvOld) 2007 2007 { … … 2037 2037 pTab->cEntriesAllocated = cAllocated; 2038 2038 2039 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);2039 RTSpinlockRelease(pNetwork->hAddrSpinlock); 2040 2040 2041 2041 RTMemFree(paOld); … … 2150 2150 } 2151 2151 2152 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);2152 RTSpinlockRelease(pNetwork->hAddrSpinlock); 2153 2153 2154 2154 if (pMatchingIf) … … 2183 2183 } 2184 2184 2185 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);2185 RTSpinlockRelease(pNetwork->hAddrSpinlock); 2186 2186 break; 2187 2187 } … … 2646 2646 RTSpinlockAcquire(pIf->hRecvInSpinlock); 2647 2647 int rc = intnetR0RingWriteFrame(&pIf->pIntBuf->Recv, pSG, pNewDstMac); 2648 RTSpinlockRelease NoInts(pIf->hRecvInSpinlock);2648 RTSpinlockRelease(pIf->hRecvInSpinlock); 2649 2649 if (RT_SUCCESS(rc)) 2650 2650 { … … 2673 2673 RTSpinlockAcquire(pIf->hRecvInSpinlock); 2674 2674 rc = intnetR0RingWriteFrame(&pIf->pIntBuf->Recv, pSG, pNewDstMac); 2675 RTSpinlockRelease NoInts(pIf->hRecvInSpinlock);2675 RTSpinlockRelease(pIf->hRecvInSpinlock); 2676 2676 if (RT_SUCCESS(rc)) 2677 2677 { … … 3223 3223 else 3224 3224 memset(&MacAddrTrunk, 0, sizeof(MacAddrTrunk)); 3225 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);3225 RTSpinlockRelease(pNetwork->hAddrSpinlock); 3226 3226 if ( ar_oper == RTNET_ARPOP_REPLY 3227 3227 && !memcmp(&pArpIPv4->ar_tha, &MacAddrTrunk, sizeof(RTMAC))) … … 3441 3441 && (!pNetwork->MacTab.fWireActive || (pTrunk->fNoPreemptDsts & INTNETTRUNKDIR_WIRE) ) ); 3442 3442 3443 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);3443 RTSpinlockRelease(pNetwork->hAddrSpinlock); 3444 3444 3445 3445 return fRc; … … 3783 3783 pIfSender->MacAddr = EthHdr.SrcMac; 3784 3784 3785 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);3785 RTSpinlockRelease(pNetwork->hAddrSpinlock); 3786 3786 } 3787 3787 … … 4154 4154 } 4155 4155 4156 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);4156 RTSpinlockRelease(pNetwork->hAddrSpinlock); 4157 4157 } 4158 4158 else … … 4238 4238 } 4239 4239 4240 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);4240 RTSpinlockRelease(pNetwork->hAddrSpinlock); 4241 4241 4242 4242 if (pTrunk) … … 4337 4337 } 4338 4338 4339 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);4339 RTSpinlockRelease(pNetwork->hAddrSpinlock); 4340 4340 4341 4341 /* … … 4742 4742 PINTNETTRUNKIF pTrunk = pNetwork->MacTab.pTrunk; 4743 4743 4744 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);4744 RTSpinlockRelease(pNetwork->hAddrSpinlock); 4745 4745 4746 4746 /* Notify the trunk about the interface being destroyed. */ … … 4754 4754 RTSpinlockAcquire(pNetwork->hAddrSpinlock); 4755 4755 pIf->pNetwork = NULL; 4756 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);4756 RTSpinlockRelease(pNetwork->hAddrSpinlock); 4757 4757 4758 4758 SUPR0ObjRelease(pNetwork->pvObj, pIf->pSession); … … 4968 4968 intnetR0BusyIncTrunk(pTrunk); 4969 4969 4970 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);4970 RTSpinlockRelease(pNetwork->hAddrSpinlock); 4971 4971 4972 4972 if (pTrunk) … … 5041 5041 pThis->MacAddr = *pMacAddr; 5042 5042 5043 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);5043 RTSpinlockRelease(pNetwork->hAddrSpinlock); 5044 5044 } 5045 5045 else … … 5069 5069 && (pNetwork->fFlags & INTNET_OPEN_FLAGS_PROMISC_ALLOW_TRUNK_HOST); 5070 5070 5071 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);5071 RTSpinlockRelease(pNetwork->hAddrSpinlock); 5072 5072 } 5073 5073 intnetR0BusyDecTrunk(pThis); … … 5148 5148 RTSpinlockAcquire(pNetwork->hAddrSpinlock); 5149 5149 pNetwork->MacTab.pTrunk = NULL; 5150 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);5150 RTSpinlockRelease(pNetwork->hAddrSpinlock); 5151 5151 5152 5152 intnetR0TrunkIfDestroy(pThis, pNetwork); … … 5252 5252 } 5253 5253 } 5254 RTSpinlockRelease NoInts(pThis->hDstTabSpinlock);5254 RTSpinlockRelease(pThis->hDstTabSpinlock); 5255 5255 Assert(!pDstTab || iDstTab < pThis->cIntDstTabs); 5256 5256 } … … 5265 5265 { 5266 5266 pThis->apIntDstTabs[iDstTab] = NULL; 5267 RTSpinlockRelease NoInts(pThis->hDstTabSpinlock);5267 RTSpinlockRelease(pThis->hDstTabSpinlock); 5268 5268 Assert(iDstTab < RT_ELEMENTS(pThis->apTaskDstTabs)); 5269 5269 } 5270 5270 else 5271 5271 { 5272 RTSpinlockRelease NoInts(pThis->hDstTabSpinlock);5272 RTSpinlockRelease(pThis->hDstTabSpinlock); 5273 5273 intnetR0AllocDstTab(pNetwork->MacTab.cEntriesAllocated, &pDstTab); 5274 5274 iDstTab = 65535; … … 5309 5309 } 5310 5310 } 5311 RTSpinlockRelease NoInts(pThis->hDstTabSpinlock);5311 RTSpinlockRelease(pThis->hDstTabSpinlock); 5312 5312 Assert(iDstTab < RT_MAX(RT_ELEMENTS(pThis->apTaskDstTabs), pThis->cIntDstTabs)); 5313 5313 } … … 5663 5663 pNetwork->MacTab.fWireActive = false; 5664 5664 5665 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);5665 RTSpinlockRelease(pNetwork->hAddrSpinlock); 5666 5666 5667 5667 /* Wait for all the interfaces to quiesce. (Interfaces cannot be … … 5699 5699 pNetwork->MacTab.pTrunk = NULL; 5700 5700 5701 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);5701 RTSpinlockRelease(pNetwork->hAddrSpinlock); 5702 5702 5703 5703 if (pTrunk) … … 5891 5891 } 5892 5892 5893 RTSpinlockRelease NoInts(pNetwork->hAddrSpinlock);5893 RTSpinlockRelease(pNetwork->hAddrSpinlock); 5894 5894 } 5895 5895
Note:
See TracChangeset
for help on using the changeset viewer.