From patchwork Tue Jan 8 23:00:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 210576 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D54612C0106 for ; Wed, 9 Jan 2013 10:51:34 +1100 (EST) Received: from localhost ([::1]:54780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiFE-0008Hz-Br for incoming@patchwork.ozlabs.org; Tue, 08 Jan 2013 18:06:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiEa-0007AL-Pc for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsiEZ-0006qg-HS for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:28 -0500 Received: from mail-ia0-f182.google.com ([209.85.210.182]:65161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiEZ-0006qZ-CV for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:27 -0500 Received: by mail-ia0-f182.google.com with SMTP id x2so886148iad.41 for ; Tue, 08 Jan 2013 15:05:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=rFRrI5ERbHLtxNTJHAttksJ1KYWmxvJa6GFeLwxSujg=; b=0fhbRhG6ZHtK+f8FvlAf22x05H0jamkQXZbEtABHYjm4cg05GbgnfsDV3bWCRzwtgU U6ky2hSEKj6B85tkaXgxajVrgBSo37G/S5F0Lm2/tXIW2PHy6Z5TmuJxA8ejvfEkM8LZ /ThzKlAsbPZjb0BclTEk+l75t9mNcczKgBdF1dEMpH6+B78opYdNbedMMMde12/9HUK9 RwCaJ4NHyEU5acI8lXCouUetNBKP2gW33lG14QgdP9etqfXMeVRtkb+72qbYxZiE2trn 2Rtmx78LtWYbAwqzOdyliHMNaJe5DRL/7+e0Q2GuJCFErWO7pOd3J85s15hPn3OumRzf fG9Q== X-Received: by 10.50.214.38 with SMTP id nx6mr10181026igc.28.1357686326954; Tue, 08 Jan 2013 15:05:26 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id bg10sm698964igc.6.2013.01.08.15.05.26 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 08 Jan 2013 15:05:26 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 8 Jan 2013 17:00:07 -0600 Message-Id: <1357686009-13139-11-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357686009-13139-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1357686009-13139-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.182 Cc: aliguori@us.ibm.com, tomoki.sekiyama.qu@hitachi.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 10/12] qemu-ga: guest_suspend(): improve error reporting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Luiz Capitulino Most errors are QERR_UNDEFINED_ERROR today. Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth Signed-off-by: Michael Roth --- 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)