X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Flibaio.c;h=9cc910d73bc19fdbb690baa5295131fc0f7addbc;hb=9c0f3f3279985b724c2f1358bb05cc2c795f2265;hp=f17260d32911523b563d3c8493abcb3f67960eba;hpb=0303a2613762c630083c4bf7418f7e08c1d552a5;p=fio.git

diff --git a/engines/libaio.c b/engines/libaio.c
index f17260d3..9cc910d7 100644
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -9,11 +9,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
+#include <libaio.h>
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_LIBAIO
-
 struct libaio_data {
 	io_context_t aio_ctx;
 	struct io_event *aio_events;
@@ -30,9 +29,12 @@ struct libaio_options {
 static struct fio_option options[] = {
 	{
 		.name	= "userspace_reap",
+		.lname	= "Libaio userspace reaping",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= offsetof(struct libaio_options, userspace_reap),
 		.help	= "Use alternative user-space reap implementation",
+		.category = FIO_OPT_C_ENGINE,
+		.group	= FIO_OPT_G_LIBAIO,
 	},
 	{
 		.name	= NULL,
@@ -304,27 +306,6 @@ static struct ioengine_ops ioengine = {
 	.option_struct_size	= sizeof(struct libaio_options),
 };
 
-#else /* FIO_HAVE_LIBAIO */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_libaio_init(struct thread_data fio_unused *td)
-{
-	log_err("fio: libaio not available\n");
-	return 1;
-}
-
-static struct ioengine_ops ioengine = {
-	.name		= "libaio",
-	.version	= FIO_IOOPS_VERSION,
-	.init		= fio_libaio_init,
-};
-
-#endif
-
 static void fio_init fio_libaio_register(void)
 {
 	register_ioengine(&ioengine);