[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-5.1 v2 54/54] qga/commands-win32: Add missing error-propagati
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-5.1 v2 54/54] qga/commands-win32: Add missing error-propagation code |
Date: |
Mon, 6 Apr 2020 19:47:43 +0200 |
Running the coccinelle script produced:
$ spatch \
--macro-file scripts/cocci-macro-file.h --include-headers \
--sp-file scripts/coccinelle/find-missing-error_propagate.cocci \
--keep-comments --smpl-spacing --dir .
HANDLING: ./qga/commands-win32.c
[[manual check required: error_propagate() might be missing in
acquire_privilege() ./qga/commands-win32.c:1344:4]]
[[manual check required: error_propagate() might be missing in
acquire_privilege() ./qga/commands-win32.c:1360:4]]
[[manual check required: error_propagate() might be missing in
check_suspend_mode() ./qga/commands-win32.c:1343:4]]
[[manual check required: error_propagate() might be missing in
check_suspend_mode() ./qga/commands-win32.c:1359:4]]
Add the missing error_propagate() after review.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
qga/commands-win32.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index b49920e201..8b66098056 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1341,13 +1341,18 @@ void qmp_guest_suspend_disk(Error **errp)
*mode = GUEST_SUSPEND_MODE_DISK;
check_suspend_mode(*mode, &local_err);
+ if (local_err) {
+ goto out;
+ }
acquire_privilege(SE_SHUTDOWN_NAME, &local_err);
+ if (local_err) {
+ goto out;
+ }
execute_async(do_suspend, mode, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- g_free(mode);
- }
+out:
+ error_propagate(errp, local_err);
+ g_free(mode);
}
void qmp_guest_suspend_ram(Error **errp)
@@ -1357,13 +1362,18 @@ void qmp_guest_suspend_ram(Error **errp)
*mode = GUEST_SUSPEND_MODE_RAM;
check_suspend_mode(*mode, &local_err);
+ if (local_err) {
+ goto out;
+ }
acquire_privilege(SE_SHUTDOWN_NAME, &local_err);
+ if (local_err) {
+ goto out;
+ }
execute_async(do_suspend, mode, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- g_free(mode);
- }
+out:
+ error_propagate(errp, local_err);
+ g_free(mode);
}
void qmp_guest_suspend_hybrid(Error **errp)
--
2.21.1
- Re: [PATCH-for-5.1 v2 48/54] scripts/coccinelle: Use &error_abort in TypeInfo::instance_init(), (continued)
- [PATCH-for-5.1 v2 43/54] hw/mips/cps: Add missing error-propagation code, Philippe Mathieu-Daudé, 2020/04/06
- [PATCH-for-5.1 v2 45/54] hw/net/xilinx_axienet: Add missing error-propagation code, Philippe Mathieu-Daudé, 2020/04/06
- [PATCH-for-5.1 v2 52/54] hw/mips/boston: Add missing error-propagation code, Philippe Mathieu-Daudé, 2020/04/06
- [PATCH-for-5.1 v2 50/54] scripts/coccinelle: Find eventually missing error_propagate() calls, Philippe Mathieu-Daudé, 2020/04/06
- [PATCH-for-5.1 v2 53/54] hw/mips/mips_malta: Add missing error-propagation code, Philippe Mathieu-Daudé, 2020/04/06
- [PATCH-for-5.1 v2 54/54] qga/commands-win32: Add missing error-propagation code,
Philippe Mathieu-Daudé <=
- [PATCH-for-5.1 v2 51/54] migration/colo: Add missing error-propagation code, Philippe Mathieu-Daudé, 2020/04/06
- [PATCH-for-5.1 v2 49/54] various: Use &error_abort in instance_init(), Philippe Mathieu-Daudé, 2020/04/06
- Re: [PATCH-for-5.1 v2 00/54] various: Fix error-propagation with Coccinelle scripts, no-reply, 2020/04/06
- Re: [PATCH-for-5.1 v2 00/54] various: Fix error-propagation with Coccinelle scripts, no-reply, 2020/04/06