diff mbox

[PULL,32/38] qga: Drop superfluous error_is_set()

Message ID 1399575182-9768-33-git-send-email-lcapitulino@redhat.com
State New
Headers show

Commit Message

Luiz Capitulino May 8, 2014, 6:52 p.m. UTC 
From: Markus Armbruster <armbru@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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qga/commands-win32.c | 10 ----------
 1 file changed, 10 deletions(-)
diff mbox

Patch

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,