summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-05-02 13:26:39 +0200
committerLuiz Capitulino <lcapitulino@redhat.com>2014-05-09 09:11:31 -0400
commit5e54769c921a3d8cd8858444f5a3fa62cc44260e (patch)
tree7ff8ec7e3f77a0a58dbbdcac1989b5f7505938eb
parent0f230bf70eb9d74fe87df2a44bc7a69ed01ecbe3 (diff)
downloadqemu-5e54769c921a3d8cd8858444f5a3fa62cc44260e.zip
qga: Drop superfluous error_is_set()
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>
-rw-r--r--qga/commands-win32.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 3483c0d4c5..d793dd0c85 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,