[Qemu-devel] [6993] Fix the build for --disable-aio

[Anthony Liguori]

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 <address@hidden>

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
 };