From patchwork Wed Apr 18 19:30:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 153572 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 968A9B6F6E for ; Thu, 19 Apr 2012 05:52:27 +1000 (EST) Received: from localhost ([::1]:47193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKavQ-0007FM-8y for incoming@patchwork.ozlabs.org; Wed, 18 Apr 2012 15:52:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKavH-0007FF-Ap for qemu-devel@nongnu.org; Wed, 18 Apr 2012 15:52:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKavF-0002E9-Gy for qemu-devel@nongnu.org; Wed, 18 Apr 2012 15:52:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32290) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKavF-0002Dx-8u for qemu-devel@nongnu.org; Wed, 18 Apr 2012 15:52:13 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3IJq9bv029873 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 18 Apr 2012 15:52:09 -0400 Received: from localhost (ovpn-113-24.phx2.redhat.com [10.3.113.24]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3IJUl5X019715; Wed, 18 Apr 2012 15:30:48 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 18 Apr 2012 16:30:49 -0300 Message-Id: <1334777449-18542-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1334777449-18542-1-git-send-email-lcapitulino@redhat.com> References: <1334777449-18542-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: lersek@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 2/2] qemu-ga: suspend: handle EINTR 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 The read() call in bios_supports_mode() can fail with EINTR if a child terminates during the call. Handle it. Signed-off-by: Luiz Capitulino --- qga/commands-posix.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 41ba0c5..4d8c067 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -621,10 +621,14 @@ static void bios_supports_mode(const char *pmutils_bin, const char *pmutils_arg, goto out; } - ret = read(pipefds[0], &status, sizeof(status)); - if (ret == sizeof(status) && WIFEXITED(status) && - WEXITSTATUS(status) == SUSPEND_SUPPORTED) { - goto out; + while (true) { + ret = read(pipefds[0], &status, sizeof(status)); + if (ret == sizeof(status) && WIFEXITED(status) && + WEXITSTATUS(status) == SUSPEND_SUPPORTED) { + goto out; + } else if (ret == -1 && errno != EINTR) { + break; + } } error_set(err, QERR_UNSUPPORTED);