Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 35533)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 35534)
@@ -505,4 +505,5 @@
                         || fWaitForStdErr)
                     {
+                        /** @todo r=bird: Why use u32TimeoutMS here?  */
                         rc = guest->GetProcessOutput(uPID, 0 /* aFlags */,
                                                      u32TimeoutMS, _64K, ComSafeArrayAsOutParam(aOutputData));
@@ -545,4 +546,7 @@
                             break;
 
+                        /** @todo r=bird: Why only apply the timeout here?
+                         *        Shouldn't it time out regardless of
+                         *        whether there is more output or not? */
                         if (   fTimeout
                             && RTTimeMilliTS() - u64StartMS > u32TimeoutMS + 5000)