From patchwork Sat Jan 26 13:38:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 215909 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 619C72C0099 for ; Sun, 27 Jan 2013 00:39:07 +1100 (EST) Received: from localhost ([::1]:54128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tz5yL-0008O2-1z for incoming@patchwork.ozlabs.org; Sat, 26 Jan 2013 08:39:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tz5yD-0008MP-ES for qemu-devel@nongnu.org; Sat, 26 Jan 2013 08:38:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tz5yC-0006I7-C4 for qemu-devel@nongnu.org; Sat, 26 Jan 2013 08:38:57 -0500 Received: from mout.web.de ([212.227.17.12]:61747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tz5y9-0006HO-8u; Sat, 26 Jan 2013 08:38:53 -0500 Received: from localhost.localdomain ([84.148.27.138]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MV4bp-1UWr243hrJ-00YP78; Sat, 26 Jan 2013 14:38:50 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 26 Jan 2013 14:38:45 +0100 Message-Id: <1359207525-10945-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Provags-ID: V02:K0:mr7nzoG3P570T3rCfX3aCotlwmXJmk4XE7CCfHVWaPG HOGv/UXNLSRiH8TD++EEqODkY7WF+rT5fyhaHDvEel5Hpa3cFr sc1w/6a6r0nW/CmFeQwF5ZCALGh3fbhInv49VI9XBvOa0obQAs ZShLyZsuWlna0Spjbbp4LuXgRNnTGJRABp7uFryli+0rlrdELe CrQfALPZmCg59u7PAZEIQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.12 Cc: Kevin Wolf , Jeff Cody , "1.3.x" , blauwirbel@gmail.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH for-1.4] block/raw-posix: Build fix for O_ASYNC 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 Commit eeb6b45d48800e96f67ef2a5c80332557fd45ddb (block: raw-posix image file reopen) broke the build on OpenIndiana. illumos has no O_ASYNC. Exclude it from flags to be compared and use I_SETSIG ioctl after newly opening file. Cf. e61ab1da7e98357da47c54d8f893b9bd6ff2f7f9 for qemu-ga. Cc: qemu-stable@nongnu.org (1.3.x) Cc: Jeff Cody Signed-off-by: Andreas Färber --- block/raw-posix.c | 14 +++++++++++++- 1 Datei geändert, 13 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 657af95..336c938 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -46,6 +46,7 @@ #ifdef __sun__ #define _POSIX_PTHREAD_SEMANTICS 1 #include +#include #endif #ifdef __linux__ #include @@ -345,7 +346,10 @@ static int raw_reopen_prepare(BDRVReopenState *state, raw_s->fd = -1; - int fcntl_flags = O_APPEND | O_ASYNC | O_NONBLOCK; + int fcntl_flags = O_APPEND | O_NONBLOCK; +#ifndef CONFIG_SOLARIS + fcntl_flags |= O_ASYNC; +#endif #ifdef O_NOATIME fcntl_flags |= O_NOATIME; #endif @@ -376,6 +380,14 @@ static int raw_reopen_prepare(BDRVReopenState *state, raw_s->fd = qemu_open(state->bs->filename, raw_s->open_flags); if (raw_s->fd == -1) { ret = -1; + } else { +#ifdef CONFIG_SOLARIS + ret = ioctl(raw_s->fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI); + if (ret == -1) { + qemu_close(raw_s->fd); + raw_s->fd = -1; + } +#endif } } return ret;