| Message ID | 1462677405-4752-3-git-send-email-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08.05.2016 05:16, Eric Blake wrote: > The command line defaults to BDRV_O_UNMAP, but can use > -d to reset it. Meanwhile, the 'open' subcommand was > defaulting to no discards, with no way to set it. > > The command line has both -n and -tMODE to set a variety > of cache modes, but the 'open' subcommand had only -n. > > The 'open' subcommand had no way to set BDRV_O_NATIVE_AIO. > > Note that the 'reopen' subcommand uses '-c' where the > command line and 'open' use -t. Making that consistent > would be a separate patch. > > Signed-off-by: Eric Blake <eblake@redhat.com> > > --- > v5: was 5/6, move earlier, retitle, and add more options using > similar -dMODE rather than new -u > --- > qemu-io.c | 29 +++++++++++++++++++++++++---- > 1 file changed, 25 insertions(+), 4 deletions(-) Reviewed-by: Max Reitz <mreitz@redhat.com> > > diff --git a/qemu-io.c b/qemu-io.c > index 0a1a3df..5ef3ef7 100644 > --- a/qemu-io.c > +++ b/qemu-io.c > @@ -106,7 +106,10 @@ static void open_help(void) > " Opens a file for subsequent use by all of the other qemu-io commands.\n" > " -r, -- open file read-only\n" > " -s, -- use snapshot file\n" > -" -n, -- disable host cache\n" > +" -n, -- disable host cache, short for -t none\n" > +" -k, -- use kernel AIO implementation (on Linux only)\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" > "\n"); > } > @@ -120,7 +123,7 @@ static const cmdinfo_t open_cmd = { > .argmin = 1, > .argmax = -1, > .flags = CMD_NOFILE_OK, > - .args = "[-rsn] [-o options] [path]", > + .args = "[-rsnk] [-t cache] [-d discard] [-o options] [path]", > .oneline = "open the file specified by path", > .help = open_help, > }; > @@ -137,14 +140,14 @@ static QemuOptsList empty_opts = { > > static int open_f(BlockBackend *blk, int argc, char **argv) > { > - int flags = 0; > + int flags = BDRV_O_UNMAP; I don't think I would have changed the default here, but considering that qemu-io is a debugging tool, it's fine as long as all tests still pass. (And they do as far as I can tell.) > int readonly = 0; > bool writethrough = true; > int c; > QemuOpts *qopts; > QDict *opts; > > - while ((c = getopt(argc, argv, "snro:")) != -1) { > + while ((c = getopt(argc, argv, "snro:kt:d:")) != -1) { > switch (c) { > case 's': > flags |= BDRV_O_SNAPSHOT; > @@ -156,9 +159,27 @@ 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); > + qemu_opts_reset(&empty_opts); > + return 0; > + } > + break; > + case 'd': > + if (bdrv_parse_discard_flags(optarg, &flags) < 0) { > + error_report("Invalid discard option: %s", optarg); > + qemu_opts_reset(&empty_opts); > + return 0; > + } > + break; > case 'o': > if (imageOpts) { > printf("--image-opts and 'open -o' are mutually exclusive\n"); > + qemu_opts_reset(&empty_opts); Silent fix? :-) > return 0; > } > if (!qemu_opts_parse_noisily(&empty_opts, optarg, false)) { >
diff --git a/qemu-io.c b/qemu-io.c index 0a1a3df..5ef3ef7 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -106,7 +106,10 @@ static void open_help(void) " Opens a file for subsequent use by all of the other qemu-io commands.\n" " -r, -- open file read-only\n" " -s, -- use snapshot file\n" -" -n, -- disable host cache\n" +" -n, -- disable host cache, short for -t none\n" +" -k, -- use kernel AIO implementation (on Linux only)\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" "\n"); } @@ -120,7 +123,7 @@ static const cmdinfo_t open_cmd = { .argmin = 1, .argmax = -1, .flags = CMD_NOFILE_OK, - .args = "[-rsn] [-o options] [path]", + .args = "[-rsnk] [-t cache] [-d discard] [-o options] [path]", .oneline = "open the file specified by path", .help = open_help, }; @@ -137,14 +140,14 @@ static QemuOptsList empty_opts = { static int open_f(BlockBackend *blk, int argc, char **argv) { - int flags = 0; + int flags = BDRV_O_UNMAP; int readonly = 0; bool writethrough = true; int c; QemuOpts *qopts; QDict *opts; - while ((c = getopt(argc, argv, "snro:")) != -1) { + while ((c = getopt(argc, argv, "snro:kt:d:")) != -1) { switch (c) { case 's': flags |= BDRV_O_SNAPSHOT; @@ -156,9 +159,27 @@ 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); + qemu_opts_reset(&empty_opts); + return 0; + } + break; + case 'd': + if (bdrv_parse_discard_flags(optarg, &flags) < 0) { + error_report("Invalid discard option: %s", optarg); + qemu_opts_reset(&empty_opts); + return 0; + } + break; case 'o': if (imageOpts) { printf("--image-opts and 'open -o' are mutually exclusive\n"); + qemu_opts_reset(&empty_opts); return 0; } if (!qemu_opts_parse_noisily(&empty_opts, optarg, false)) {
The command line defaults to BDRV_O_UNMAP, but can use -d to reset it. Meanwhile, the 'open' subcommand was defaulting to no discards, with no way to set it. The command line has both -n and -tMODE to set a variety of cache modes, but the 'open' subcommand had only -n. The 'open' subcommand had no way to set BDRV_O_NATIVE_AIO. Note that the 'reopen' subcommand uses '-c' where the command line and 'open' use -t. Making that consistent would be a separate patch. Signed-off-by: Eric Blake <eblake@redhat.com> --- v5: was 5/6, move earlier, retitle, and add more options using similar -dMODE rather than new -u --- qemu-io.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)