From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdnIs-0003cG-RN for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:28:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TdnIp-0006a5-7d for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:28:14 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:61340) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdnIp-0006Ze-38 for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:28:11 -0500 Received: by mail-ia0-f173.google.com with SMTP id w21so8540242iac.4 for ; Wed, 28 Nov 2012 11:28:09 -0800 (PST) Sender: fluxion Date: Wed, 28 Nov 2012 13:27:37 -0600 From: mdroth Message-ID: <20121128192737.GF8690@vm> References: <1354021324-31561-1-git-send-email-lcapitulino@redhat.com> <1354021324-31561-5-git-send-email-lcapitulino@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1354021324-31561-5-git-send-email-lcapitulino@redhat.com> Subject: Re: [Qemu-devel] [PATCH 04/10] qemu-ga: qmp_guest_shutdown(): improve error reporting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org On Tue, Nov 27, 2012 at 11:01:58AM -0200, Luiz Capitulino wrote: > Most errors are QERR_UNDEFINED_ERROR. Also, adds ga_wait_child() as > a future commit will use it too. > > Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth > --- > qga/commands-posix.c | 48 ++++++++++++++++++++++++++++++++++++++---------- > 1 file changed, 38 insertions(+), 10 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 92fc550..b3a3f26 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -46,10 +46,29 @@ extern char **environ; > #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) > { > const char *shutdown_flag; > - pid_t rpid, pid; > + Error *local_err = NULL; > + pid_t pid; > int status; > > 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) { > shutdown_flag = "-r"; > } else { > - error_set(err, QERR_INVALID_PARAMETER_VALUE, "mode", > - "halt|powerdown|reboot"); > + error_setg(err, > + "mode is invalid (valid values are: halt|powerdown|reboot"); > return; > } > > @@ -77,18 +96,27 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err) > "hypervisor initiated shutdown", (char*)NULL, environ); > _exit(EXIT_FAILURE); > } else if (pid < 0) { > - goto exit_err; > + error_setg_errno(err, errno, "failed to create child process"); > + return; > } > > - do { > - rpid = waitpid(pid, &status, 0); > - } while (rpid == -1 && errno == EINTR); > - if (rpid == pid && WIFEXITED(status) && !WEXITSTATUS(status)) { > + ga_wait_child(pid, &status, &local_err); > + if (error_is_set(&local_err)) { > + error_propagate(err, local_err); > return; > } > > -exit_err: > - error_set(err, QERR_UNDEFINED_ERROR); > + 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 { > -- > 1.8.0 >