[Qemu-devel] [PATCH v2 0/3] Trivial patches

[Qemu-devel] [PATCH v2 0/3] Trivial patches

[Maria Kustova]

These patches are the part of OPW application.
Two of them update help messages of qemu-io utility.
And last one replaces fprintf() with error_setg() in curl.c

Changes v1 -> v2:
 * Removed trailing "\n" from the error string in error_setg() call

Maria Kustova (3):
  qemu-io-cmds: Fixed typo in example for writev.
  block: Replaced old error handling with error reporting API.
  qemu-io: Extended "--cmd" description in usage text

 block/curl.c   | 2 +-
 qemu-io-cmds.c | 2 +-
 qemu-io.c      | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

-- 
1.8.2.1

[Qemu-devel] [PATCH v2 1/3] qemu-io-cmds: Fixed typo in example for writev.

[Maria Kustova]

Signed-off-by: Maria Kustova <maria.k@catit.be>
---
 qemu-io-cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index f1de24c..5707bda 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -1087,7 +1087,7 @@ writev_help(void)
 " writes a range of bytes from the given offset source from multiple buffers\n"
 "\n"
 " Example:\n"
-" 'write 512 1k 1k' - writes 2 kilobytes at 512 bytes into the open file\n"
+" 'writev 512 1k 1k' - writes 2 kilobytes at 512 bytes into the open file\n"
 "\n"
 " Writes into a segment of the currently open file, using a buffer\n"
 " filled with a set pattern (0xcdcdcdcd).\n"
-- 
1.8.2.1

[Qemu-devel] [PATCH v2 2/3] block: Replaced old error handling with error reporting API.

[Maria Kustova]

Signed-off-by: Maria Kustova <maria.k@catit.be>
---
Changes v1 -> v2:
 * Removed trailing "\n" from the error string
---
 block/curl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/curl.c b/block/curl.c
index 3494c6d..359637e 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -538,8 +538,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
     return 0;
 
 out:
-    fprintf(stderr, "CURL: Error opening file: %s\n", state->errmsg);
+    error_setg(errp, "CURL: Error opening file: %s", state->errmsg);
     curl_easy_cleanup(state->curl);
     state->curl = NULL;
 out_noclean:
-- 
1.8.2.1

Re: [Qemu-devel] [PATCH v2 2/3] block: Replaced old error handling with error reporting API.

[Kevin Wolf]

Am 18.03.2014 um 06:59 hat Maria Kustova geschrieben:
> Signed-off-by: Maria Kustova <maria.k@catit.be>
> ---
> Changes v1 -> v2:
>  * Removed trailing "\n" from the error string
> ---
>  block/curl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/block/curl.c b/block/curl.c
> index 3494c6d..359637e 100644
> --- a/block/curl.c
> +++ b/block/curl.c
> @@ -538,8 +538,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,

Did you manually edit this patch? It is corrupted and I had to manually
s/538,8/538,7/ before I could apply it.

Kevin

>      return 0;
>  
>  out:
> -    fprintf(stderr, "CURL: Error opening file: %s\n", state->errmsg);
> +    error_setg(errp, "CURL: Error opening file: %s", state->errmsg);
>      curl_easy_cleanup(state->curl);
>      state->curl = NULL;
>  out_noclean:
> -- 
> 1.8.2.1
> 

[Qemu-devel] [PATCH v2 3/3] qemu-io: Extended "--cmd" description in usage text

[Maria Kustova]

It's not clear from the usage description that "--cmd" option accepts its argument as a string, so any special symbols have to be quoted from the shell.
Updates in usage text:
 - Specified parameter format for "--cmd" option.
 - Added an instruction how to get help for "--cmd" option.

Signed-off-by: Maria Kustova <maria.k@catit.be>
---
 qemu-io.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/qemu-io.c b/qemu-io.c
index fc38608..be68d96 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -194,10 +194,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"
@@ -208,8 +209,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)
-- 
1.8.2.1

Re: [Qemu-devel] [PATCH v2 3/3] qemu-io: Extended "--cmd" description in usage text

[Kevin Wolf]

Am 18.03.2014 um 06:59 hat Maria Kustova geschrieben:
> It's not clear from the usage description that "--cmd" option accepts its argument as a string, so any special symbols have to be quoted from the shell.

For future patches, please make sure to wrap your lines in the commit
message at ideally ~72, but at most 80 characters. This instance I fixed
up while applying the patch.

Kevin

> Updates in usage text:
>  - Specified parameter format for "--cmd" option.
>  - Added an instruction how to get help for "--cmd" option.
> 
> Signed-off-by: Maria Kustova <maria.k@catit.be>

Re: [Qemu-devel] [PATCH v2 0/3] Trivial patches

[Kevin Wolf]

Am 18.03.2014 um 06:59 hat Maria Kustova geschrieben:
> These patches are the part of OPW application.
> Two of them update help messages of qemu-io utility.
> And last one replaces fprintf() with error_setg() in curl.c
> 
> Changes v1 -> v2:
>  * Removed trailing "\n" from the error string in error_setg() call
> 
> Maria Kustova (3):
>   qemu-io-cmds: Fixed typo in example for writev.
>   block: Replaced old error handling with error reporting API.
>   qemu-io: Extended "--cmd" description in usage text

Thanks, applied patches 1 and 3 to the block branch for 2.0, and patch 2
to block-next for 2.1.

Kevin

Re: [Qemu-devel] [PATCH v2 0/3] Trivial patches

[Stefan Hajnoczi]

On Tue, Mar 18, 2014 at 09:59:16AM +0400, Maria Kustova wrote:
> These patches are the part of OPW application.
> Two of them update help messages of qemu-io utility.
> And last one replaces fprintf() with error_setg() in curl.c
> 
> Changes v1 -> v2:
>  * Removed trailing "\n" from the error string in error_setg() call
> 
> Maria Kustova (3):
>   qemu-io-cmds: Fixed typo in example for writev.
>   block: Replaced old error handling with error reporting API.
>   qemu-io: Extended "--cmd" description in usage text
> 
>  block/curl.c   | 2 +-
>  qemu-io-cmds.c | 2 +-
>  qemu-io.c      | 9 ++++++---
>  3 files changed, 8 insertions(+), 5 deletions(-)

Thanks!

Acked-by: Stefan Hajnoczi <stefanha@redhat.com>