mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-ga: qmp_guest_shutdown(): improve error reporting

Browse Source 
Most errors are QERR_UNDEFINED_ERROR. Also, adds ga_wait_child() as
a future commit will use it too.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Luiz Capitulino 2012-11-27 11:01:58 -02:00 committed by Michael Roth
parent db3edb6655
commit d220a6dfea
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
qga/commands-posix.c
View File

@ -46,10 +46,29 @@ extern char **environ;
#endif #endif
#endif #endif
static void ga_wait_child(pid_t pid, int *status, Error **err)
{
pid_t rpid;
*status = 0;
do {
rpid = waitpid(pid, status, 0);
} while (rpid == -1 && errno == EINTR);
if (rpid == -1) {
error_setg_errno(err, errno, "failed to wait for child (pid: %d)", pid);
return;
}
g_assert(rpid == pid);
}
void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err) void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err)
{ {
const char *shutdown_flag; const char *shutdown_flag;
pid_t rpid, pid; Error *local_err = NULL;
pid_t pid;
int status; int status;
slog("guest-shutdown called, mode: %s", mode); slog("guest-shutdown called, mode: %s", mode);
@ -60,8 +79,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err)
} else if (strcmp(mode, "reboot") == 0) { } else if (strcmp(mode, "reboot") == 0) {
shutdown_flag = "-r"; shutdown_flag = "-r";
} else { } else {
error_set(err, QERR_INVALID_PARAMETER_VALUE, "mode", error_setg(err,
"halt|powerdown|reboot"); "mode is invalid (valid values are: halt|powerdown|reboot");
return; return;
} }
@ -77,18 +96,27 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err)
"hypervisor initiated shutdown", (char*)NULL, environ); "hypervisor initiated shutdown", (char*)NULL, environ);
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} else if (pid < 0) { } else if (pid < 0) {
goto exit_err; error_setg_errno(err, errno, "failed to create child process");
}
do {
rpid = waitpid(pid, &status, 0);
} while (rpid == -1 && errno == EINTR);
if (rpid == pid && WIFEXITED(status) && !WEXITSTATUS(status)) {
return; return;
} }
exit_err: ga_wait_child(pid, &status, &local_err);
error_set(err, QERR_UNDEFINED_ERROR); if (error_is_set(&local_err)) {
error_propagate(err, local_err);
return;
}
if (!WIFEXITED(status)) {
error_setg(err, "child process has terminated abnormally");
return;
}
if (WEXITSTATUS(status)) {
error_setg(err, "child process has failed to shutdown");
return;
}
/* succeded */
} }
typedef struct GuestFileHandle { typedef struct GuestFileHandle {