Index: /trunk/src/VBox/HostServices/GuestControl/service.cpp
===================================================================
--- /trunk/src/VBox/HostServices/GuestControl/service.cpp	(revision 29899)
+++ /trunk/src/VBox/HostServices/GuestControl/service.cpp	(revision 29900)
@@ -100,26 +100,7 @@
 
 /**
- * Structure for holding a buffered host command.
- */
-struct HostCmd
-{
-    /** The context ID this command belongs to. Will be extracted
-      * from the HGCM parameters. */
-    uint32_t mContextID;
-    /** Dynamic structure for holding the HGCM parms */
-    VBOXGUESTCTRPARAMBUFFER mParmBuf;
-
-    /** The standard contructor. */
-    HostCmd() : mContextID(0) {}
-};
-/** The host cmd list + iterator type */
-typedef std::list< HostCmd > HostCmdList;
-typedef std::list< HostCmd >::iterator HostCmdListIter;
-typedef std::list< HostCmd >::const_iterator HostCmdListIterConst;
-
-/**
  * Structure for holding an uncompleted guest call.
  */
-struct GuestCall
+struct ClientWaiter
 {
     /** Client ID; a client can have multiple handles! */
@@ -133,14 +114,33 @@
 
     /** The standard contructor. */
-    GuestCall() : mClientID(0), mHandle(0), mParms(NULL), mNumParms(0) {}
+    ClientWaiter() : mClientID(0), mHandle(0), mParms(NULL), mNumParms(0) {}
     /** The normal contructor. */
-    GuestCall(uint32_t aClientID, VBOXHGCMCALLHANDLE aHandle,
+    ClientWaiter(uint32_t aClientID, VBOXHGCMCALLHANDLE aHandle,
               VBOXHGCMSVCPARM aParms[], uint32_t cParms)
               : mClientID(aClientID), mHandle(aHandle), mParms(aParms), mNumParms(cParms) {}
 };
 /** The guest call list type */
-typedef std::list< GuestCall > CallList;
-typedef std::list< GuestCall >::iterator CallListIter;
-typedef std::list< GuestCall >::const_iterator CallListIterConst;
+typedef std::list< ClientWaiter > ClientWaiterList;
+typedef std::list< ClientWaiter >::iterator CallListIter;
+typedef std::list< ClientWaiter >::const_iterator CallListIterConst;
+
+/**
+ * Structure for holding a buffered host command.
+ */
+struct HostCmd
+{
+    /** The context ID this command belongs to. Will be extracted
+      * from the HGCM parameters. */
+    uint32_t mContextID;
+    /** Dynamic structure for holding the HGCM parms */
+    VBOXGUESTCTRPARAMBUFFER mParmBuf;
+
+    /** The standard contructor. */
+    HostCmd() : mContextID(0) {}
+};
+/** The host cmd list + iterator type */
+typedef std::list< HostCmd > HostCmdList;
+typedef std::list< HostCmd >::iterator HostCmdListIter;
+typedef std::list< HostCmd >::const_iterator HostCmdListIterConst;
 
 /**
@@ -162,5 +162,5 @@
     void *mpvHostData;
     /** The deferred calls list. */
-    CallList mClientList;
+    ClientWaiterList mClientWaiterList;
     /** The host command list. */
     HostCmdList mHostCmds;
@@ -436,10 +436,10 @@
     int rc = VINF_SUCCESS;
 
-    CallListIter itCall = mClientList.begin();
-    while (itCall != mClientList.end())
+    CallListIter itCall = mClientWaiterList.begin();
+    while (itCall != mClientWaiterList.end())
     {
         if (itCall->mClientID == u32ClientID)
         {       
-            itCall = mClientList.erase(itCall);
+            itCall = mClientWaiterList.erase(itCall);
         }
         else
@@ -543,5 +543,5 @@
     if (mHostCmds.empty()) /* If command list is empty, defer ... */
     {
-        mClientList.push_back(GuestCall(u32ClientID, callHandle, paParms, cParms));
+        mClientWaiterList.push_back(ClientWaiter(u32ClientID, callHandle, paParms, cParms));
         rc = VINF_HGCM_ASYNC_EXECUTE;
     }
@@ -576,6 +576,6 @@
 {
     int rc = VINF_SUCCESS;
-    CallListIter it = mClientList.begin();
-    while (it != mClientList.end())
+    CallListIter it = mClientWaiterList.begin();
+    while (it != mClientWaiterList.end())
     {
         if (it->mClientID == u32ClientID)
@@ -588,5 +588,5 @@
             if (mpHelpers)
                 mpHelpers->pfnCallComplete(it->mHandle, rc);
-            it = mClientList.erase(it);
+            it = mClientWaiterList.erase(it);
         }
         else
@@ -660,7 +660,7 @@
     {
         /* Can we wake up a waiting client on guest? */
-        if (!mClientList.empty())
-        {
-            GuestCall guest = mClientList.front();
+        if (!mClientWaiterList.empty())
+        {
+            ClientWaiter guest = mClientWaiterList.front();
             rc = sendHostCmdToGuest(&newCmd,
                                     guest.mHandle, guest.mNumParms, guest.mParms);
@@ -669,5 +669,5 @@
             AssertPtr(mpHelpers);
             mpHelpers->pfnCallComplete(guest.mHandle, rc);
-            mClientList.pop_front();
+            mClientWaiterList.pop_front();
 
             /* If we got VERR_TOO_MUCH_DATA we buffer the host command in the next block