From 27f436d9f72a9d2d3da3adfdf712757152eab29e Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 5 Sep 2019 09:15:41 -0600 Subject: [PATCH] engines/io_uring: use its own option group Was under libaio for now, lets move it to a distinct option group name. Signed-off-by: Jens Axboe --- engines/io_uring.c | 10 +++++----- optgroup.h | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/engines/io_uring.c b/engines/io_uring.c index 53bd39c8..10cfe9f2 100644 --- a/engines/io_uring.c +++ b/engines/io_uring.c @@ -94,7 +94,7 @@ static struct fio_option options[] = { .off1 = offsetof(struct ioring_options, hipri), .help = "Use polled IO completions", .category = FIO_OPT_C_ENGINE, - .group = FIO_OPT_G_LIBAIO, + .group = FIO_OPT_G_IOURING, }, { .name = "fixedbufs", @@ -103,7 +103,7 @@ static struct fio_option options[] = { .off1 = offsetof(struct ioring_options, fixedbufs), .help = "Pre map IO buffers", .category = FIO_OPT_C_ENGINE, - .group = FIO_OPT_G_LIBAIO, + .group = FIO_OPT_G_IOURING, }, { .name = "registerfiles", @@ -112,7 +112,7 @@ static struct fio_option options[] = { .off1 = offsetof(struct ioring_options, registerfiles), .help = "Pre-open/register files", .category = FIO_OPT_C_ENGINE, - .group = FIO_OPT_G_LIBAIO, + .group = FIO_OPT_G_IOURING, }, { .name = "sqthread_poll", @@ -121,7 +121,7 @@ static struct fio_option options[] = { .off1 = offsetof(struct ioring_options, sqpoll_thread), .help = "Offload submission/completion to kernel thread", .category = FIO_OPT_C_ENGINE, - .group = FIO_OPT_G_LIBAIO, + .group = FIO_OPT_G_IOURING, }, { .name = "sqthread_poll_cpu", @@ -130,7 +130,7 @@ static struct fio_option options[] = { .cb = fio_ioring_sqpoll_cb, .help = "What CPU to run SQ thread polling on", .category = FIO_OPT_C_ENGINE, - .group = FIO_OPT_G_LIBAIO, + .group = FIO_OPT_G_IOURING, }, { .name = NULL, diff --git a/optgroup.h b/optgroup.h index 8009bf25..55ef5934 100644 --- a/optgroup.h +++ b/optgroup.h @@ -64,6 +64,7 @@ enum opt_category_group { __FIO_OPT_G_MMAP, __FIO_OPT_G_ISCSI, __FIO_OPT_G_NBD, + __FIO_OPT_G_IOURING, __FIO_OPT_G_NR, FIO_OPT_G_RATE = (1ULL << __FIO_OPT_G_RATE), @@ -104,6 +105,7 @@ enum opt_category_group { FIO_OPT_G_INVALID = (1ULL << __FIO_OPT_G_NR), FIO_OPT_G_ISCSI = (1ULL << __FIO_OPT_G_ISCSI), FIO_OPT_G_NBD = (1ULL << __FIO_OPT_G_NBD), + FIO_OPT_G_IOURING = (1ULL << __FIO_OPT_G_IOURING), }; extern const struct opt_group *opt_group_from_mask(uint64_t *mask); -- 2.25.1