From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:49772)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1Tdne4-0004dY-RW
	for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:50:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1Tdne3-0004BT-5Z
	for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:50:08 -0500
Received: from mail-ie0-f173.google.com ([209.85.223.173]:58757)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1Tdne2-0004Ae-V9
	for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:50:07 -0500
Received: by mail-ie0-f173.google.com with SMTP id e13so10145692iej.4
	for <qemu-devel@nongnu.org>; Wed, 28 Nov 2012 11:50:06 -0800 (PST)
Sender: fluxion <flukshun@gmail.com>
Date: Wed, 28 Nov 2012 13:49:55 -0600
From: mdroth <mdroth@linux.vnet.ibm.com>
Message-ID: <20121128194955.GL8690@vm>
References: <1354021324-31561-1-git-send-email-lcapitulino@redhat.com>
	<1354021324-31561-11-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-11-git-send-email-lcapitulino@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 10/10] qemu-ga: guest_suspend(): improve
	error reporting
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Luiz Capitulino <lcapitulino@redhat.com>
Cc: qemu-devel@nongnu.org

On Tue, Nov 27, 2012 at 11:02:04AM -0200, Luiz Capitulino wrote:
> Most errors are QERR_UNDEFINED_ERROR today.
> 
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
>  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 5a7e308..ce058b5 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.8.0
>