* [Qemu-devel] [PATCH] Don't compile aio code if CONFIG_LINUX_AIO is undefined
[not found] <4A97C3E9.3060006@redhat.com>
@ 2009-08-28 12:51 ` Stefan Weil
0 siblings, 0 replies; only message in thread
From: Stefan Weil @ 2009-08-28 12:51 UTC (permalink / raw)
To: QEMU Developers; +Cc: Kevin Wolf, Anthony Liguori
This patch fixes linker errors when building QEMU without Linux AIO support.
It is based on suggestions from malc and Kevin Wolf.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
block/raw-posix.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 8a7dc15..2125d67 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -115,7 +115,9 @@ typedef struct BDRVRawState {
int fd_got_error;
int fd_media_changed;
#endif
+#ifdef CONFIG_LINUX_AIO
int use_aio;
+#endif
uint8_t* aligned_buf;
} BDRVRawState;
@@ -183,7 +185,9 @@ static int raw_open_common(BlockDriverState *bs,
const char *filename,
if (!s->aio_ctx) {
goto out_free_buf;
}
+#ifdef CONFIG_LINUX_AIO
s->use_aio = 0;
+#endif
}
return 0;
@@ -542,9 +546,11 @@ static BlockDriverAIOCB
*raw_aio_submit(BlockDriverState *bs,
if (s->aligned_buf) {
if (!qiov_is_aligned(qiov)) {
type |= QEMU_AIO_MISALIGNED;
+#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);
+ nb_sectors, cb, opaque, type);
+#endif
}
}
^ permalink raw reply related [flat|nested] only message in thread