Changeset 63155 in vbox for trunk/src/VBox
- Timestamp:
- Aug 8, 2016 12:03:31 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
r63153 r63155 1973 1973 if (RT_SUCCESS(vrc)) 1974 1974 { 1975 int guestRc;1975 int vrcGuest = VINF_SUCCESS; 1976 1976 vrc = fAsync 1977 1977 ? pProcess->i_startProcessAsync() 1978 : pProcess->i_startProcess(30 * 1000 /* 30s timeout */, & guestRc);1978 : pProcess->i_startProcess(30 * 1000 /* 30s timeout */, &vrcGuest); 1979 1979 1980 1980 if ( RT_SUCCESS(vrc) 1981 1981 && !fAsync 1982 && RT_FAILURE( guestRc)1982 && RT_FAILURE(vrcGuest) 1983 1983 ) 1984 1984 { 1985 1985 if (pGuestRc) 1986 *pGuestRc = guestRc;1986 *pGuestRc = vrcGuest; 1987 1987 vrc = VERR_GSTCTL_GUEST_ERROR; 1988 1988 } … … 2257 2257 uint32_t uTimeoutMS = mStartupInfo.mTimeoutMS; 2258 2258 2259 int guestRc;2259 int vrcGuest = VINF_SUCCESS; 2260 2260 bool fDone = false; 2261 2261 … … 2293 2293 2294 2294 vrc = pProcess->i_waitFor(fWaitFlags, GET_REMAINING_TIME, 2295 waitRes, & guestRc);2295 waitRes, &vrcGuest); 2296 2296 if (RT_FAILURE(vrc)) 2297 2297 break; … … 2354 2354 GET_REMAINING_TIME, 2355 2355 byBuf, sizeof(byBuf), 2356 &cbRead, & guestRc);2356 &cbRead, &vrcGuest); 2357 2357 if ( RT_FAILURE(vrc) 2358 2358 || vrc == VWRN_GSTCTL_OBJECTSTATE_CHANGED) … … 2388 2388 GET_REMAINING_TIME, 2389 2389 byBuf, sizeof(byBuf), 2390 &cbRead, & guestRc);2390 &cbRead, &vrcGuest); 2391 2391 if ( RT_FAILURE(vrc) 2392 2392 || vrc == VWRN_GSTCTL_OBJECTSTATE_CHANGED) … … 2407 2407 #undef GET_REMAINING_TIME 2408 2408 2409 if (RT_FAILURE( guestRc))2409 if (RT_FAILURE(vrcGuest)) 2410 2410 vrc = VERR_GSTCTL_GUEST_ERROR; 2411 2411 2412 LogFlowThisFunc(("Loop ended with rc=%Rrc, guestRc=%Rrc, waitRes=%RU32\n",2413 vrc, guestRc, waitRes));2412 LogFlowThisFunc(("Loop ended with rc=%Rrc, vrcGuest=%Rrc, waitRes=%RU32\n", 2413 vrc, vrcGuest, waitRes)); 2414 2414 if (pGuestRc) 2415 *pGuestRc = guestRc;2415 *pGuestRc = vrcGuest; 2416 2416 2417 2417 LogFlowFuncLeaveRC(vrc);
Note:
See TracChangeset
for help on using the changeset viewer.