[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/12] qemu-ga: guest_suspend(): improve error repor
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 10/12] qemu-ga: guest_suspend(): improve error reporting |
Date: |
Tue, 8 Jan 2013 17:00:07 -0600 |
From: Luiz Capitulino <address@hidden>
Most errors are QERR_UNDEFINED_ERROR today.
Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
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 f3ee492..614a421 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -702,8 +702,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);
@@ -741,23 +742,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.9.5
- [Qemu-devel] [PULL 0/12] qemu-ga: error handling improvements and fsfreeze hooks, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 01/12] qemu-ga: guest_file_handle_find(): take an Error argument, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 02/12] qemu-ga: qmp_guest_file_close(): fix fclose() error check, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 03/12] qemu-ga: qmp_guest_file_*: improve error reporting, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 04/12] qemu-ga: qmp_guest_shutdown(): improve error reporting, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 05/12] qemu-ga: build_fs_mount_list(): take an Error argument, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 06/12] qemu-ga: qmp_guest_fsfreeze_*(): get rid of sprintf() + error_set(), Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 08/12] qemu-ga: qmp_guest_network_get_interfaces(): get rid of snprintf() + error_set(), Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 09/12] qemu-ga: bios_supports_mode(): improve error reporting, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 07/12] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set(), Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 10/12] qemu-ga: guest_suspend(): improve error reporting,
Michael Roth <=
- [Qemu-devel] [PATCH 11/12] qemu-ga: execute hook to quiesce the guest on fsfreeze-freeze/thaw, Michael Roth, 2013/01/08
- [Qemu-devel] [PATCH 12/12] qemu-ga: sample fsfreeze hooks, Michael Roth, 2013/01/08
- Re: [Qemu-devel] [PULL 0/12] qemu-ga: error handling improvements and fsfreeze hooks, Anthony Liguori, 2013/01/09