diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 13:47:22 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 13:47:22 +0000 |
| commit | c1b94a0ed2332b08ea7799c003c3ee9996782a3c (patch) | |
| tree | b263954ef8abf2e8c92cba8841c57c822b090f60 /qemu-io.c | |
| parent | 319c66d5abfb30553895589d24b70043639ad06d (diff) | |
| parent | 198fd05c357afff22f0b0e02639937519ed49b1f (diff) | |
| download | focaccia-qemu-c1b94a0ed2332b08ea7799c003c3ee9996782a3c.tar.gz focaccia-qemu-c1b94a0ed2332b08ea7799c003c3ee9996782a3c.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.0.0-rc1 # gpg: Signature made Wed 19 Mar 2014 13:03:27 GMT using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: dataplane: fix implicit IOThread refcount block/nfs: report errors from libnfs block/nfs: bump libnfs requirement to 1.9.3 qcow2: Fix fail path in realloc_refcount_block() qcow2: Correct comment for realloc_refcount_block() qemu-io: Extended "--cmd" description in usage text qemu-io-cmds: Fixed typo in example for writev. block: Add error handling to bdrv_invalidate_cache() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-io.c')
| -rw-r--r-- | qemu-io.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qemu-io.c b/qemu-io.c index 2d119c28a6..5d7b53f756 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -193,10 +193,11 @@ static const cmdinfo_t quit_cmd = { static void usage(const char *name) { printf( -"Usage: %s [-h] [-V] [-rsnm] [-c cmd] ... [file]\n" +"Usage: %s [-h] [-V] [-rsnm] [-c STRING] ... [file]\n" "QEMU Disk exerciser\n" "\n" -" -c, --cmd command to execute\n" +" -c, --cmd STRING execute command with its arguments\n" +" from the given string\n" " -r, --read-only export read-only\n" " -s, --snapshot use snapshot file\n" " -n, --nocache disable host cache\n" @@ -207,8 +208,10 @@ static void usage(const char *name) " -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" +"\n" +"See '%s -c help' for information on available commands." "\n", - name); + name, name); } static char *get_prompt(void) |