[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 11/14] qemu-io: adds option to use aio engine
From: |
Aarushi Mehta |
Subject: |
[Qemu-devel] [PATCH v6 11/14] qemu-io: adds option to use aio engine |
Date: |
Fri, 19 Jul 2019 19:05:27 +0530 |
Use -i AIOMODE instead of -k.
Signed-off-by: Aarushi Mehta <address@hidden>
---
qemu-io.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index f64eca6940..3cee06248e 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -130,7 +130,7 @@ static void open_help(void)
" -C, -- use copy-on-read\n"
" -n, -- disable host cache, short for -t none\n"
" -U, -- force shared permissions\n"
-" -k, -- use kernel AIO implementation (on Linux only)\n"
+" -i, -- use AIO mode (threads, native or io_uring)"
" -t, -- use the given cache mode for the image\n"
" -d, -- use the given discard mode for the image\n"
" -o, -- options to be given to the block driver"
@@ -187,9 +187,6 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
case 'r':
readonly = 1;
break;
- case 'k':
- flags |= BDRV_O_NATIVE_AIO;
- break;
case 't':
if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) {
error_report("Invalid cache option: %s", optarg);
@@ -204,6 +201,13 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
return -EINVAL;
}
break;
+ case 'i':
+ if (bdrv_parse_aio(optarg, &flags) < 0) {
+ error_report("Invalid aio option: %s", optarg);
+ qemu_opts_reset(&empty_opts);
+ return -EINVAL;
+ }
+ break;
case 'o':
if (imageOpts) {
printf("--image-opts and 'open -o' are mutually exclusive\n");
@@ -291,7 +295,7 @@ static void usage(const char *name)
" -n, --nocache disable host cache, short for -t none\n"
" -C, --copy-on-read enable copy-on-read\n"
" -m, --misalign misalign allocations for O_DIRECT\n"
-" -k, --native-aio use kernel AIO implementation (on Linux only)\n"
+" -i, --aio=MODE use AIO mode (threads, native or io_uring)\n"
" -t, --cache=MODE use the given cache mode for the image\n"
" -d, --discard=MODE use the given discard mode for the image\n"
" -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
@@ -489,7 +493,7 @@ static QemuOptsList file_opts = {
int main(int argc, char **argv)
{
int readonly = 0;
- const char *sopt = "hVc:d:f:rsnCmkt:T:U";
+ const char *sopt = "hVc:d:f:rsnCmit:T:U";
const struct option lopt[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
@@ -500,7 +504,7 @@ int main(int argc, char **argv)
{ "nocache", no_argument, NULL, 'n' },
{ "copy-on-read", no_argument, NULL, 'C' },
{ "misalign", no_argument, NULL, 'm' },
- { "native-aio", no_argument, NULL, 'k' },
+ { "aio", required_argument, NULL, 'i' },
{ "discard", required_argument, NULL, 'd' },
{ "cache", required_argument, NULL, 't' },
{ "trace", required_argument, NULL, 'T' },
@@ -565,8 +569,11 @@ int main(int argc, char **argv)
case 'm':
qemuio_misalign = true;
break;
- case 'k':
- flags |= BDRV_O_NATIVE_AIO;
+ case 'i':
+ if (bdrv_parse_aio(optarg, &flags) < 0) {
+ error_report("Invalid aio option: %s", optarg);
+ exit(1);
+ }
break;
case 't':
if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) {
--
2.21.0
- [Qemu-devel] [PATCH v6 05/14] stubs: add stubs for io_uring interface, (continued)
- [Qemu-devel] [PATCH v6 05/14] stubs: add stubs for io_uring interface, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 06/14] util/async: add aio interfaces for io_uring, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 07/14] blockdev: accept io_uring as option, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 08/14] block/file-posix.c: extend to use io_uring, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 09/14] block: add trace events for io_uring, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 10/14] block/io_uring: adds userspace completion polling, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 11/14] qemu-io: adds option to use aio engine,
Aarushi Mehta <=
- Re: [Qemu-devel] [PATCH v6 11/14] qemu-io: adds option to use aio engine, Julia Suvorova, 2019/07/24
- [Qemu-devel] [PATCH v6 12/14] qemu-img: adds option to use aio engine, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 13/14] qemu-nbd: adds option for aio engines, Aarushi Mehta, 2019/07/19
- [Qemu-devel] [PATCH v6 14/14] qemu-iotest: enable testing with qemu-io aio options, Aarushi Mehta, 2019/07/19