From 85b2e2616c276c65bb5e6023acc896049c11ca30 Mon Sep 17 00:00:00 2001 Message-Id: <85b2e2616c276c65bb5e6023acc896049c11ca30.1367947969.git.minovotn@redhat.com> In-Reply-To: <707b9b97153063374d2530e72c49b1499fc21af9.1367947969.git.minovotn@redhat.com> References: <707b9b97153063374d2530e72c49b1499fc21af9.1367947969.git.minovotn@redhat.com> From: Laszlo Ersek Date: Mon, 6 May 2013 19:27:48 +0200 Subject: [PATCH 083/114] qemu-ga: guest_suspend(): improve error reporting RH-Author: Laszlo Ersek Message-id: <1367868499-27603-26-git-send-email-lersek@redhat.com> Patchwork-id: 51124 O-Subject: [RHEL-6.5 qemu-kvm PATCH v2 25/56] qemu-ga: guest_suspend(): improve error reporting Bugzilla: 952873 RH-Acked-by: Jeffrey Cody RH-Acked-by: Gerd Hoffmann RH-Acked-by: Paolo Bonzini From: Luiz Capitulino Most errors are QERR_UNDEFINED_ERROR today. Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth Signed-off-by: Michael Roth (cherry picked from commit 7b3760879bf323a0d9654a5158d5b3ed51882505) Signed-off-by: Laszlo Ersek --- qga/commands-posix.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) Signed-off-by: Michal Novotny --- qga/commands-posix.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 61e6bcd..ab60e42 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -703,8 +703,9 @@ out: static void guest_suspend(const char *pmutils_bin, const char *sysfile_str, Error **err) { + Error *local_err = NULL; char *pmutils_path; - pid_t rpid, pid; + pid_t pid; int status; pmutils_path = g_find_program_in_path(pmutils_bin); @@ -742,23 +743,29 @@ static void guest_suspend(const char *pmutils_bin, const char *sysfile_str, } _exit(EXIT_SUCCESS); + } else if (pid < 0) { + error_setg_errno(err, errno, "failed to create child process"); + goto out; } - g_free(pmutils_path); + ga_wait_child(pid, &status, &local_err); + if (error_is_set(&local_err)) { + error_propagate(err, local_err); + goto out; + } - if (pid < 0) { - goto exit_err; + if (!WIFEXITED(status)) { + error_setg(err, "child process has terminated abnormally"); + goto out; } - do { - rpid = waitpid(pid, &status, 0); - } while (rpid == -1 && errno == EINTR); - if (rpid == pid && WIFEXITED(status) && !WEXITSTATUS(status)) { - return; + if (WEXITSTATUS(status)) { + error_setg(err, "child process has failed to suspend"); + goto out; } -exit_err: - error_set(err, QERR_UNDEFINED_ERROR); +out: + g_free(pmutils_path); } void qmp_guest_suspend_disk(Error **err) -- 1.7.11.7