From patchwork Wed Jul 7 06:25:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MORITA Kazutaka X-Patchwork-Id: 58080 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 8CF97B6EFE for ; Wed, 7 Jul 2010 16:28:06 +1000 (EST) Received: from localhost ([127.0.0.1]:35856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWO70-0000Ab-O8 for incoming@patchwork.ozlabs.org; Wed, 07 Jul 2010 02:28:02 -0400 Received: from [140.186.70.92] (port=52261 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWO5y-00009g-NX for qemu-devel@nongnu.org; Wed, 07 Jul 2010 02:26:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWO5x-0007lQ-AJ for qemu-devel@nongnu.org; Wed, 07 Jul 2010 02:26:58 -0400 Received: from sh.osrg.net ([192.16.179.4]:58104) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWO5w-0007kl-RL for qemu-devel@nongnu.org; Wed, 07 Jul 2010 02:26:57 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o676Qnmi026056; Wed, 7 Jul 2010 15:26:50 +0900 Received: from localhost (dfs1401.osrg.net [10.68.14.1]) by fs.osrg.net (Postfix) with ESMTP id CF7E33E0242; Wed, 7 Jul 2010 15:26:49 +0900 (JST) From: MORITA Kazutaka To: "C.W. Betts" Date: Wed, 7 Jul 2010 15:25:30 +0900 Message-Id: <1278483930-16479-1-git-send-email-morita.kazutaka@lab.ntt.co.jp> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: References: X-Dispatcher: imput version 20070423(IM149) Lines: 27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 07 Jul 2010 15:26:50 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.1 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: qemu-devel@nongnu.org, morita.kazutaka@lab.ntt.co.jp Subject: [Qemu-devel] [PATCH] sheepdog: fix compile error on systems without TCP_CORK 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 WIN32 is not only the system which doesn't have TCP_CORK (e.g. OS X). Signed-off-by: MORITA Kazutaka --- Betts, I think this patch fix the compile error. Can you try this one? block/sheepdog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 69a2494..81aa564 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -889,7 +889,7 @@ static int aio_flush_request(void *opaque) return !QLIST_EMPTY(&s->outstanding_aio_head); } -#ifdef _WIN32 +#if !defined(SOL_TCP) || !defined(TCP_CORK) static int set_cork(int fd, int v) {