From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgBcM-0000r1-TL for qemu-devel@nongnu.org; Fri, 02 May 2014 07:27:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgBcC-0007Xo-8K for qemu-devel@nongnu.org; Fri, 02 May 2014 07:27:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgBcB-0007XK-VV for qemu-devel@nongnu.org; Fri, 02 May 2014 07:26:52 -0400 From: Markus Armbruster Date: Fri, 2 May 2014 13:26:39 +0200 Message-Id: <1399030002-27222-12-git-send-email-armbru@redhat.com> In-Reply-To: <1399030002-27222-1-git-send-email-armbru@redhat.com> References: <1399030002-27222-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 11/14] qga: Drop superfluous error_is_set() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com acquire_privilege(), execute_async() and check_suspend_mode() do nothing when called with an error set. Callers shouldn't do that, and no caller does. Drop the superfluous tests. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Michael Roth --- qga/commands-win32.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 3483c0d..d793dd0 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -35,10 +35,6 @@ static void acquire_privilege(const char *name, Error **errp) TOKEN_PRIVILEGES priv; Error *local_err = NULL; - if (error_is_set(errp)) { - return; - } - if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &token)) { @@ -74,9 +70,6 @@ static void execute_async(DWORD WINAPI (*func)(LPVOID), LPVOID opaque, { Error *local_err = NULL; - if (error_is_set(errp)) { - return; - } HANDLE thread = CreateThread(NULL, 0, func, opaque, 0, NULL); if (!thread) { error_set(&local_err, QERR_QGA_COMMAND_FAILED, @@ -268,9 +261,6 @@ static void check_suspend_mode(GuestSuspendMode mode, Error **errp) SYSTEM_POWER_CAPABILITIES sys_pwr_caps; Error *local_err = NULL; - if (error_is_set(errp)) { - return; - } ZeroMemory(&sys_pwr_caps, sizeof(sys_pwr_caps)); if (!GetPwrCapabilities(&sys_pwr_caps)) { error_set(&local_err, QERR_QGA_COMMAND_FAILED, -- 1.8.1.4