From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LqXk4-0006rm-He
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:10:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LqXk4-0006ra-27
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:10:52 -0400
Received: from [199.232.76.173] (port=45574 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LqXk3-0006rX-Ud
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:10:51 -0400
Received: from savannah.gnu.org ([199.232.41.3]:54759 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LqXk3-0005oW-OF
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:10:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LqXk3-0006jr-3t
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 19:10:51 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LqXk2-0006jm-Sg
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 19:10:51 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LqXk2-0006jm-Sg@cvs.savannah.gnu.org>
Date: Sun, 05 Apr 2009 19:10:50 +0000
Subject: [Qemu-devel] [6993] Fix the build for --disable-aio
Reply-To: qemu-devel@nongnu.org
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

Revision: 6993
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6993
Author:   aliguori
Date:     2009-04-05 19:10:50 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
Fix the build for --disable-aio

This was reported by malc.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/block-raw-posix.c

Modified: trunk/block-raw-posix.c
===================================================================
--- trunk/block-raw-posix.c	2009-04-05 18:43:41 UTC (rev 6992)
+++ trunk/block-raw-posix.c	2009-04-05 19:10:50 UTC (rev 6993)
@@ -1018,8 +1018,10 @@
         s->fd_open_flags = open_flags;
         /* open will not fail even if no floppy is inserted */
         open_flags |= O_NONBLOCK;
+#ifdef CONFIG_AIO
     } else if (strstart(filename, "/dev/sg", NULL)) {
         bs->sg = 1;
+#endif
     }
 #endif
 #if defined(__FreeBSD__)
@@ -1210,6 +1212,7 @@
     return ioctl(s->fd, req, buf);
 }
 
+#ifdef CONFIG_AIO
 static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,
         unsigned long int req, void *buf,
         BlockDriverCompletionFunc *cb, void *opaque)
@@ -1228,6 +1231,7 @@
 
     return &acb->common;
 }
+#endif
 
 #elif defined(__FreeBSD__)
 
@@ -1439,5 +1443,7 @@
     .bdrv_set_locked	= raw_set_locked,
     /* generic scsi device */
     .bdrv_ioctl		= raw_ioctl,
+#ifdef CONFIG_AIO
     .bdrv_aio_ioctl	= raw_aio_ioctl,
+#endif
 };