From patchwork Fri Aug 28 14:50:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 32381 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 bilbo.ozlabs.org (Postfix) with ESMTPS id F028EB7BEB for ; Sat, 29 Aug 2009 01:09:08 +1000 (EST) Received: from localhost ([127.0.0.1]:34531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh34X-0007lL-S1 for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 11:09:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh2mr-0002HN-QP for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:50:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh2mm-0002At-VR for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:50:45 -0400 Received: from [199.232.76.173] (port=37242 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh2mm-0002AW-NT for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:50:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35523) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh2mm-0005Cl-4y for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:50:40 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SEobG7019856; Fri, 28 Aug 2009 10:50:37 -0400 Received: from doriath (vpn-10-114.bos.redhat.com [10.16.10.114]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7SEoXPr020254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 28 Aug 2009 10:50:35 -0400 Date: Fri, 28 Aug 2009 11:50:30 -0300 From: Luiz Capitulino To: qemu-devel@nongnu.org Message-ID: <20090828115030.19a2aa22@doriath> Organization: Red Hat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: hch@lst.de Subject: [Qemu-devel] [PATCH] block: Fix build 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 Current build is broken because laio_submit() is only available if the host has Linux AIO support, otherwise we will get the following build error: """ block/raw-posix.o: In function `raw_aio_submit': qemu-qmp/block/raw-posix.c:546: undefined reference to `laio_submit' collect2: ld returned 1 exit status """ Signed-off-by: Luiz Capitulino --- PS: Hope this is right, only compiled tested. diff --git a/block/raw-posix.c b/block/raw-posix.c index 8a7dc15..b5f03d6 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -542,10 +542,13 @@ static BlockDriverAIOCB *raw_aio_submit(BlockDriverState *bs, if (s->aligned_buf) { if (!qiov_is_aligned(qiov)) { type |= QEMU_AIO_MISALIGNED; - } else if (s->use_aio) { + } +#ifdef CONFIG_LINUX_AIO + else if (s->use_aio) { return laio_submit(bs, s->aio_ctx, s->fd, sector_num, qiov, nb_sectors, cb, opaque, type); } +#endif } return paio_submit(bs, s->aio_ctx, s->fd, sector_num, qiov, nb_sectors,