From patchwork Fri Feb 18 13:17:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 83589 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 50AB9B70F5 for ; Sat, 19 Feb 2011 00:18:55 +1100 (EST) Received: from localhost ([127.0.0.1]:59480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqQEW-0003WY-4Q for incoming@patchwork.ozlabs.org; Fri, 18 Feb 2011 08:18:52 -0500 Received: from [140.186.70.92] (port=39849 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqQDA-0002qg-QI for qemu-devel@nongnu.org; Fri, 18 Feb 2011 08:17:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PqQD9-0006u8-5r for qemu-devel@nongnu.org; Fri, 18 Feb 2011 08:17:28 -0500 Received: from mel.act-europe.fr ([194.98.77.210]:37605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PqQD8-0006tm-Sj for qemu-devel@nongnu.org; Fri, 18 Feb 2011 08:17:27 -0500 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id B26FDCB0263 for ; Fri, 18 Feb 2011 14:17:25 +0100 (CET) X-Virus-Scanned: amavisd-new at eu.adacore.com Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8AxmvB54jWRc for ; Fri, 18 Feb 2011 14:17:17 +0100 (CET) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) by mel.act-europe.fr (Postfix) with ESMTP id 40296CB0229 for ; Fri, 18 Feb 2011 14:17:17 +0100 (CET) Received: by ulanbator.act-europe.fr (Postfix, from userid 501) id 6442EC32886; Fri, 18 Feb 2011 14:17:16 +0100 (CET) From: Tristan Gingold To: qemu-devel@nongnu.org Date: Fri, 18 Feb 2011 14:17:16 +0100 Message-Id: <1298035036-51807-1-git-send-email-gingold@adacore.com> X-Mailer: git-send-email 1.7.3.GIT In-Reply-To: <1297959841-41235-1-git-send-email-gingold@adacore.com> References: <1297959841-41235-1-git-send-email-gingold@adacore.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 194.98.77.210 Subject: [Qemu-devel] [PATCH] Use sigwait instead of sigwaitinfo. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix compilation failure on Darwin. Signed-off-by: Tristan Gingold --- compatfd.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compatfd.c b/compatfd.c index a7cebc4..bd377c4 100644 --- a/compatfd.c +++ b/compatfd.c @@ -26,45 +26,45 @@ struct sigfd_compat_info static void *sigwait_compat(void *opaque) { struct sigfd_compat_info *info = opaque; - int err; sigset_t all; sigfillset(&all); sigprocmask(SIG_BLOCK, &all, NULL); - do { - siginfo_t siginfo; + while (1) { + int sig; + int err; - err = sigwaitinfo(&info->mask, &siginfo); - if (err == -1 && errno == EINTR) { - err = 0; - continue; - } - - if (err > 0) { - char buffer[128]; + err = sigwait(&info->mask, &sig); + if (err != 0) { + if (errno == EINTR) { + continue; + } else { + return NULL; + } + } else { + struct qemu_signalfd_siginfo buffer; size_t offset = 0; - memcpy(buffer, &err, sizeof(err)); + memset(&buffer, 0, sizeof(buffer)); + buffer.ssi_signo = sig; + while (offset < sizeof(buffer)) { ssize_t len; - len = write(info->fd, buffer + offset, + len = write(info->fd, (char *)&buffer + offset, sizeof(buffer) - offset); if (len == -1 && errno == EINTR) continue; if (len <= 0) { - err = -1; - break; + return NULL; } offset += len; } } - } while (err >= 0); - - return NULL; + } } static int qemu_signalfd_compat(const sigset_t *mask)