From mboxrd@z Thu Jan  1 00:00:00 1970
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 <lcapitulino@redhat.com>) id 1Mh2mm-0005Cl-4y
	for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:50:40 -0400
Date: Fri, 28 Aug 2009 11:50:30 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20090828115030.19a2aa22@doriath>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] block: Fix build
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: hch@lst.de


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 <lcapitulino@redhat.com>
---
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,