From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, kwolf@redhat.com, mreitz@redhat.com
Subject: [Qemu-devel] [PATCH v4 1/6] qemu-io: Add missing option documentation
Date: Wed, 4 May 2016 21:42:34 -0600 [thread overview]
Message-ID: <1462419759-14694-2-git-send-email-eblake@redhat.com> (raw)
In-Reply-To: <1462419759-14694-1-git-send-email-eblake@redhat.com>
Commit 499afa2 added --image-opts, but forgot to document it in
--help. Likewise for commit 9e8f183 and -d/--discard.
Finally, commit 10d9d75 removed -g/--growable, but forgot to
cull it from the valid short options.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
qemu-io.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/qemu-io.c b/qemu-io.c
index 0598251..4aba7e0 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -221,6 +221,7 @@ static void usage(const char *name)
"\n"
" --object OBJECTDEF define an object such as 'secret' for\n"
" passwords and/or encryption keys\n"
+" --image-opts treat file as option string\n"
" -c, --cmd STRING execute command with its arguments\n"
" from the given string\n"
" -f, --format FMT specifies the block driver to use\n"
@@ -230,6 +231,7 @@ static void usage(const char *name)
" -m, --misalign misalign allocations for O_DIRECT\n"
" -k, --native-aio use kernel AIO implementation (on Linux only)\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 FILE enable trace events listed in the given file\n"
" -h, --help display this help and exit\n"
" -V, --version output version information and exit\n"
@@ -410,7 +412,7 @@ static QemuOptsList file_opts = {
int main(int argc, char **argv)
{
int readonly = 0;
- const char *sopt = "hVc:d:f:rsnmgkt:T:";
+ const char *sopt = "hVc:d:f:rsnmkt:T:";
const struct option lopt[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
--
2.5.5
next prev parent reply other threads:[~2016-05-05 3:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 3:42 [Qemu-devel] [PATCH v4 0/6] qemu-io: UI enhancements Eric Blake
2016-05-05 3:42 ` Eric Blake [this message]
2016-05-06 15:34 ` [Qemu-devel] [PATCH v4 1/6] qemu-io: Add missing option documentation Max Reitz
2016-05-05 3:42 ` [Qemu-devel] [PATCH v4 2/6] qemu-io: Use bool for command line flags Eric Blake
2016-05-06 15:39 ` Max Reitz
2016-05-05 3:42 ` [Qemu-devel] [PATCH v4 3/6] qemu-io: Allow unaligned access by default Eric Blake
2016-05-06 15:59 ` Max Reitz
2016-05-06 16:14 ` Eric Blake
2016-05-05 3:42 ` [Qemu-devel] [PATCH v4 4/6] qemu-io: Add 'write -f' to test FUA flag Eric Blake
2016-05-06 16:05 ` Max Reitz
2016-05-06 16:20 ` Eric Blake
2016-05-05 3:42 ` [Qemu-devel] [PATCH v4 5/6] qemu-io: Add 'open -u' to set BDRV_O_UNMAP after the fact Eric Blake
2016-05-06 16:08 ` Max Reitz
2016-05-06 16:21 ` Eric Blake
2016-05-06 17:01 ` Eric Blake
2016-05-05 3:42 ` [Qemu-devel] [PATCH v4 6/6] qemu-io: Add 'write -z -u' to test MAY_UNMAP flag Eric Blake
2016-05-06 16:11 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462419759-14694-2-git-send-email-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).