Changeset 49408 in vbox for trunk/src/VBox/Main
- Timestamp:
- Nov 7, 2013 1:18:13 PM (11 years ago)
- Location:
- trunk/src/VBox/Main/src-server
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
r49103 r49408 1559 1559 1560 1560 /** 1561 * Private method; delete all records from the list 1562 * m->llDescriptions that match the given type. 1561 * Private method; delete all records from the list 1562 * m->llDescriptions that match the given type. 1563 1563 * @param aType 1564 1564 * @return -
trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp
r49103 r49408 373 373 */ 374 374 375 //1. no host drive CD/DVD image 375 //1. no host drive CD/DVD image 376 376 BOOL fHostDrive = false; 377 377 rc = pMedium->COMGETTER(HostDrive)(&fHostDrive); … … 381 381 continue; 382 382 383 //2. the image must be accessible and readable 383 //2. the image must be accessible and readable 384 384 MediumState_T ms; 385 385 rc = pMedium->RefreshState(&ms); … … 389 389 continue; 390 390 391 //3. only ISO image is exported 391 //3. only ISO image is exported 392 392 Bstr bstrLocation; 393 393 rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam()); -
trunk/src/VBox/Main/src-server/HostImpl.cpp
r49235 r49408 228 228 HostPowerService *pHostPowerService; 229 229 /** Host's DNS informaton fetching */ 230 HostDnsMonitorProxy 230 HostDnsMonitorProxy hostDnsMonitorProxy; 231 231 }; 232 232 -
trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp
r49295 r49408 303 303 CheckComArgOutPointerValid(aName); 304 304 AutoCaller autoCaller(this); 305 306 if (FAILED(autoCaller.rc())) 305 306 if (FAILED(autoCaller.rc())) 307 307 return autoCaller.rc(); 308 308 309 309 { 310 310 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); 311 311 312 312 if (aName == mName) 313 313 return S_OK; … … 341 341 { 342 342 AutoCaller autoCaller(this); 343 if (FAILED(autoCaller.rc())) 343 if (FAILED(autoCaller.rc())) 344 344 return autoCaller.rc(); 345 345 346 346 { 347 347 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); 348 348 349 349 if (aEnabled == m->fEnabled) 350 350 return S_OK; … … 392 392 if (FAILED(autoCaller.rc())) 393 393 return autoCaller.rc(); 394 394 395 395 { 396 396 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); 397 397 398 398 if (aIPv4NetworkCidr == m->IPv4NetworkCidr) 399 399 return S_OK; 400 401 /* silently ignore network cidr update for now. 402 * todo: keep internally guest address of port forward rule 400 401 /* silently ignore network cidr update for now. 402 * todo: keep internally guest address of port forward rule 403 403 * as offset from network id. 404 404 */ … … 434 434 { 435 435 AutoCaller autoCaller(this); 436 if (FAILED(autoCaller.rc())) 436 if (FAILED(autoCaller.rc())) 437 437 return autoCaller.rc(); 438 438 439 439 { 440 440 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); … … 473 473 474 474 AutoCaller autoCaller(this); 475 if (FAILED(autoCaller.rc())) 475 if (FAILED(autoCaller.rc())) 476 476 return autoCaller.rc(); 477 477 … … 482 482 return S_OK; 483 483 484 /* silently ignore network IPv6 prefix update. 484 /* silently ignore network IPv6 prefix update. 485 485 * todo: see similar todo in NATNetwork::COMSETTER(Network)(IN_BSTR) 486 486 */ … … 515 515 { 516 516 AutoCaller autoCaller(this); 517 if (FAILED(autoCaller.rc())) 517 if (FAILED(autoCaller.rc())) 518 518 return autoCaller.rc(); 519 519 520 520 { 521 521 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); 522 522 523 523 if (aAdvertiseDefaultIPv6Route == m->fAdvertiseDefaultIPv6Route) 524 524 return S_OK; … … 554 554 if (FAILED(autoCaller.rc())) 555 555 return autoCaller.rc(); 556 556 557 557 { 558 558 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); 559 559 560 560 if (aNeedDhcpServer == m->fNeedDhcpServer) 561 561 return S_OK; … … 685 685 { 686 686 AutoCaller autoCaller(this); 687 if (FAILED(autoCaller.rc())) 687 if (FAILED(autoCaller.rc())) 688 688 return autoCaller.rc(); 689 689 690 690 { 691 691 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); … … 696 696 if (static_cast<uint32_t>(aLoopbackIp6) == m->u32LoopbackIp6) 697 697 return S_OK; 698 698 699 699 m->u32LoopbackIp6 = aLoopbackIp6; 700 700 } … … 741 741 { 742 742 AutoCaller autoCaller(this); 743 if (FAILED(autoCaller.rc())) 743 if (FAILED(autoCaller.rc())) 744 744 return autoCaller.rc(); 745 745 … … 813 813 { 814 814 AutoCaller autoCaller(this); 815 if (FAILED(autoCaller.rc())) 815 if (FAILED(autoCaller.rc())) 816 816 return autoCaller.rc(); 817 817 … … 825 825 { 826 826 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); 827 NATRuleMap& mapRules = aIsIpv6 ? m->mapName2PortForwardRule6 827 NATRuleMap& mapRules = aIsIpv6 ? m->mapName2PortForwardRule6 828 828 : m->mapName2PortForwardRule4; 829 829 830 830 NATRuleMap::iterator it = mapRules.find(aPortForwardRuleName); 831 831 … … 841 841 mapRules.erase(it); 842 842 } 843 843 844 844 { 845 845 AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
Note:
See TracChangeset
for help on using the changeset viewer.