On Mon, Jul 29, 2019 at 08:46:47PM +0530, Aarushi Mehta wrote: > Signed-off-by: Aarushi Mehta <mehta.aar...@gmail.com> > --- > qemu-io.c | 24 ++++++++++++++++++++---- > 1 file changed, 20 insertions(+), 4 deletions(-) > > diff --git a/qemu-io.c b/qemu-io.c > index f64eca6940..6568f0c369 100644 > --- a/qemu-io.c > +++ b/qemu-io.c > @@ -130,7 +130,8 @@ 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" > +" -k, -- use kernel AIO implementation (Linux only, prefer use of -i)\n" > +" -i, -- use AIO mode (threads, native or io_uring)"
Missing \n > " -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" > @@ -172,7 +173,7 @@ static int open_f(BlockBackend *blk, int argc, char > **argv) > QDict *opts; > bool force_share = false; > > - while ((c = getopt(argc, argv, "snCro:kt:d:U")) != -1) { > + while ((c = getopt(argc, argv, "snCro:kit:d:U")) != -1) { 'i' requires an argument so it must be "i:". > switch (c) { > case 's': > flags |= BDRV_O_SNAPSHOT; > @@ -204,6 +205,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 +299,9 @@ 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" > +" -k, --native-aio use kernel AIO implementation\n" > +" (Linux only, prefer use of -i)\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 +499,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:rsnCmki:t:T:U"; > const struct option lopt[] = { > { "help", no_argument, NULL, 'h' }, > { "version", no_argument, NULL, 'V' }, > @@ -501,6 +511,7 @@ int main(int argc, char **argv) > { "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' }, > @@ -567,6 +578,11 @@ int main(int argc, char **argv) > break; > case 'k': > flags |= BDRV_O_NATIVE_AIO; Missing break statement. > + 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 > >
signature.asc
Description: PGP signature