summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-05 19:10:50 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-05 19:10:50 +0000
commit8185d2c9a20975114ebb59b0f46b615cbb83c730 (patch)
treea0a97365940527a64cf9e50138f507d5b3c27fef
parent59030a8cd4000fcf92d9b8225c6083f9e6ab86b8 (diff)
downloadqemu-8185d2c9a20975114ebb59b0f46b615cbb83c730.tar.gz
Fix the build for --disable-aio
This was reported by malc. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6993 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--block-raw-posix.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/block-raw-posix.c b/block-raw-posix.c
index bff822ea65..50aad587dc 100644
--- a/block-raw-posix.c
+++ b/block-raw-posix.c
@@ -1018,8 +1018,10 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags)
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 @@ static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
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 @@ static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,
return &acb->common;
}
+#endif
#elif defined(__FreeBSD__)
@@ -1439,5 +1443,7 @@ BlockDriver bdrv_host_device = {
.bdrv_set_locked = raw_set_locked,
/* generic scsi device */
.bdrv_ioctl = raw_ioctl,
+#ifdef CONFIG_AIO
.bdrv_aio_ioctl = raw_aio_ioctl,
+#endif
};