From fb32dd2be67519662e93ffbbe520c79d95b1fbfb Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 2 Mar 2013 22:29:33 +0100 Subject: Imported Upstream version 4.2.8-dfsg --- .../common/VBoxService/VBoxServiceControlThread.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp') diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp index 78ec20a8b..503bcbaae 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1623,18 +1623,8 @@ static int VBoxServiceControlThreadProcessWorker(PVBOXSERVICECTRLTHREAD pThread) rc2, rc); } - VBoxServiceVerbose(3, "[PID %u]: Cancelling pending host requests (client ID=%u)\n", - pThread->uPID, pThread->uClientID); - rc2 = VbglR3GuestCtrlCancelPendingWaits(pThread->uClientID); - if (RT_FAILURE(rc2)) - { - VBoxServiceError("[PID %u]: Cancelling pending host requests failed; rc=%Rrc\n", - pThread->uPID, rc2); - if (RT_SUCCESS(rc)) - rc = rc2; - } - - /* Disconnect from guest control service. */ + /* Disconnect this client from the guest control service. This also cancels all + * outstanding host requests. */ VBoxServiceVerbose(3, "[PID %u]: Disconnecting (client ID=%u) ...\n", pThread->uPID, pThread->uClientID); VbglR3GuestCtrlDisconnect(pThread->uClientID); -- cgit v1.2.3