From patchwork Mon Apr 28 20:27:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 343593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 14DEF1400A9 for ; Tue, 29 Apr 2014 06:34:49 +1000 (EST) Received: from localhost ([::1]:45930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WesGE-0005iZ-Ms for incoming@patchwork.ozlabs.org; Mon, 28 Apr 2014 16:34:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wes9t-00031W-SP for qemu-devel@nongnu.org; Mon, 28 Apr 2014 16:28:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wes9k-0002Xf-Pq for qemu-devel@nongnu.org; Mon, 28 Apr 2014 16:28:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wes9k-0002XM-HQ for qemu-devel@nongnu.org; Mon, 28 Apr 2014 16:28:04 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3SKS1DZ018363 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Apr 2014 16:28:02 -0400 Received: from blackfin.pond.sub.org (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3SKRx5e003124 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 28 Apr 2014 16:28:00 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D4209200DE; Mon, 28 Apr 2014 22:27:55 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 28 Apr 2014 22:27:51 +0200 Message-Id: <1398716874-18699-13-git-send-email-armbru@redhat.com> In-Reply-To: <1398716874-18699-1-git-send-email-armbru@redhat.com> References: <1398716874-18699-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2 12/15] qga: Drop superfluous error_is_set() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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,