[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/38] qga: Drop superfluous error_is_set()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 32/38] qga: Drop superfluous error_is_set() |
Date: |
Thu, 8 May 2014 14:52:56 -0400 |
From: Markus Armbruster <address@hidden>
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>
Signed-off-by: Luiz Capitulino <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.9.0
- [Qemu-devel] [PULL 26/38] qga: Use return values instead of error_is_set(errp), (continued)
- [Qemu-devel] [PULL 26/38] qga: Use return values instead of error_is_set(errp), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 28/38] qapi: Drop redundant, unclean error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 30/38] qapi: Clean up fragile use of error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 29/38] tests/qapi-schema: Drop superfluous error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 31/38] qga: Clean up fragile use of error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 34/38] dump: Drop pointless error_is_set(), DumpState member errp, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 38/38] Revert "qapi: Clean up superfluous null check in qapi_dealloc_type_str()", Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 35/38] qmp: Don't use error_is_set() to suppress additional errors, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 33/38] qemu-option: Clean up fragile use of error_is_set(), Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 36/38] qmp: use valid JSON in transaction example, Luiz Capitulino, 2014/05/08
- [Qemu-devel] [PULL 32/38] qga: Drop superfluous error_is_set(),
Luiz Capitulino <=
- [Qemu-devel] [PULL 37/38] qapi: Document optional arguments' backwards compatibility, Luiz Capitulino, 2014/05/08
- Re: [Qemu-devel] [PULL 00/38] QMP queue, Peter Maydell, 2014/05/09