[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/14] qga: Drop superfluous error_is_set()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 11/14] qga: Drop superfluous error_is_set() |
Date: |
Fri, 2 May 2014 13:26:39 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH v3 14/14] qmp: Don't use error_is_set() to suppress additional errors, (continued)
[Qemu-devel] [PATCH v3 02/14] qga: Consistently name Error ** objects errp, and not err, Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 07/14] qapi: Drop redundant, unclean error_is_set(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 08/14] tests/qapi-schema: Drop superfluous error_is_set(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 13/14] dump: Drop pointless error_is_set(), DumpState member errp, Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 09/14] qapi: Clean up fragile use of error_is_set(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 06/14] hmp: Guard against misuse of hmp_handle_error(), Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 11/14] qga: Drop superfluous error_is_set(),
Markus Armbruster <=
[Qemu-devel] [PATCH v3 01/14] qmp hmp: Consistently name Error * objects err, and not errp, Markus Armbruster, 2014/05/02
[Qemu-devel] [PATCH v3 05/14] qga: Use return values instead of error_is_set(errp), Markus Armbruster, 2014/05/02
Re: [Qemu-devel] [PATCH v3 00/14] qmp qga: Purge error_is_set(), Eric Blake, 2014/05/02
Re: [Qemu-devel] [PATCH v3 00/14] qmp qga: Purge error_is_set(), Luiz Capitulino, 2014/05/07