From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tdnd7-0003p7-Bq for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:49:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tdnd6-0003f8-8S for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:49:09 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:40876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tdnd6-0003f4-3T for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:49:08 -0500 Received: by mail-ia0-f173.google.com with SMTP id w21so8557084iac.4 for ; Wed, 28 Nov 2012 11:49:07 -0800 (PST) Sender: fluxion Date: Wed, 28 Nov 2012 13:48:18 -0600 From: mdroth Message-ID: <20121128194818.GK8690@vm> References: <1354021324-31561-1-git-send-email-lcapitulino@redhat.com> <1354021324-31561-10-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-10-git-send-email-lcapitulino@redhat.com> Subject: Re: [Qemu-devel] [PATCH 09/10] qemu-ga: bios_supports_mode(): 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:02:03AM -0200, Luiz Capitulino wrote: > Most errors are QERR_UNDEFINED_ERROR today. > > Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth > --- > qga/commands-posix.c | 46 +++++++++++++++++++++++++++------------------- > 1 file changed, 27 insertions(+), 19 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index c399f02..5a7e308 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -618,8 +618,9 @@ error: > static void bios_supports_mode(const char *pmutils_bin, const char *pmutils_arg, > const char *sysfile_str, Error **err) > { > + Error *local_err = NULL; > char *pmutils_path; > - pid_t pid, rpid; > + pid_t pid; > int status; > > pmutils_path = g_find_program_in_path(pmutils_bin); > @@ -664,31 +665,38 @@ static void bios_supports_mode(const char *pmutils_bin, const char *pmutils_arg, > } > > _exit(SUSPEND_NOT_SUPPORTED); > + } 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 undef_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)) { > - switch (WEXITSTATUS(status)) { > - case SUSPEND_SUPPORTED: > - return; > - case SUSPEND_NOT_SUPPORTED: > - error_set(err, QERR_UNSUPPORTED); > - return; > - default: > - goto undef_err; > - } > + switch (WEXITSTATUS(status)) { > + case SUSPEND_SUPPORTED: > + goto out; > + case SUSPEND_NOT_SUPPORTED: > + error_setg(err, > + "the requested suspend mode is not supported by the guest"); > + goto out; > + default: > + error_setg(err, > + "the helper program '%s' returned an unexpected exit status" > + " code (%d)", pmutils_path, WEXITSTATUS(status)); > + goto out; > } > > -undef_err: > - error_set(err, QERR_UNDEFINED_ERROR); > +out: > + g_free(pmutils_path); > } > > static void guest_suspend(const char *pmutils_bin, const char *sysfile_str, > -- > 1.8.0 >