[Qemu-devel] [PATCH] qemu-img: mandate argument to 'qemu-img check --repair'

[Qemu-devel] [PATCH] qemu-img: mandate argument to 'qemu-img check --repair'

[Prasad Joshi]

qemu-img check --repair option accepts an argument. The argument to
--repair switch can either be 'all' or 'leak'. Fix the long option to
mandate argument with --repair switch.

The patch fixes following segmentation fault

Core was generated by `qemu-img check -f qcow2 --repair all t.qcow2'.
Program terminated with signal 11, Segmentation fault.
0  in img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
588	            if (!strcmp(optarg, "leaks")) {
(gdb) bt
  0  img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
  1  __libc_start_main () from /lib/x86_64-linux-gnu/libc.so.6
  2  _start ()
(gdb)

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 qemu-img.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-img.c b/qemu-img.c
index 2e40cc1..77d946b 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -565,7 +565,7 @@ static int img_check(int argc, char **argv)
         static const struct option long_options[] = {
             {"help", no_argument, 0, 'h'},
             {"format", required_argument, 0, 'f'},
-            {"repair", no_argument, 0, 'r'},
+            {"repair", required_argument, 0, 'r'},
             {"output", required_argument, 0, OPTION_OUTPUT},
             {0, 0, 0, 0}
         };
-- 
1.8.1.2

Re: [Qemu-devel] [PATCH] qemu-img: mandate argument to 'qemu-img check --repair'

[Leandro Dorileo]

On Tue, Mar 25, 2014 at 12:08:54AM +0530, Prasad Joshi wrote:
> qemu-img check --repair option accepts an argument. The argument to
> --repair switch can either be 'all' or 'leak'. Fix the long option to
> mandate argument with --repair switch.
> 
> The patch fixes following segmentation fault
> 
> Core was generated by `qemu-img check -f qcow2 --repair all t.qcow2'.
> Program terminated with signal 11, Segmentation fault.
> 0  in img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
> 588	            if (!strcmp(optarg, "leaks")) {
> (gdb) bt
>   0  img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
>   1  __libc_start_main () from /lib/x86_64-linux-gnu/libc.so.6
>   2  _start ()
> (gdb)
> 
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>


Patch looks good to me.

Reviewed-by: Leandro Dorileo <l@dorileo.org>


> ---
>  qemu-img.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qemu-img.c b/qemu-img.c
> index 2e40cc1..77d946b 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -565,7 +565,7 @@ static int img_check(int argc, char **argv)
>          static const struct option long_options[] = {
>              {"help", no_argument, 0, 'h'},
>              {"format", required_argument, 0, 'f'},
> -            {"repair", no_argument, 0, 'r'},
> +            {"repair", required_argument, 0, 'r'},
>              {"output", required_argument, 0, OPTION_OUTPUT},
>              {0, 0, 0, 0}
>          };
> -- 
> 1.8.1.2
> 
> 

-- 
Leandro Dorileo

Re: [Qemu-devel] [PATCH for-2.0] qemu-img: mandate argument to 'qemu-img check --repair'

[Kevin Wolf]

Am 24.03.2014 um 19:38 hat Prasad Joshi geschrieben:
> qemu-img check --repair option accepts an argument. The argument to
> --repair switch can either be 'all' or 'leak'. Fix the long option to
> mandate argument with --repair switch.
> 
> The patch fixes following segmentation fault
> 
> Core was generated by `qemu-img check -f qcow2 --repair all t.qcow2'.
> Program terminated with signal 11, Segmentation fault.
> 0  in img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
> 588	            if (!strcmp(optarg, "leaks")) {
> (gdb) bt
>   0  img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
>   1  __libc_start_main () from /lib/x86_64-linux-gnu/libc.so.6
>   2  _start ()
> (gdb)
> 
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

Stefan, this should still go into 2.0.

Kevin

Re: [Qemu-devel] [PATCH] qemu-img: mandate argument to 'qemu-img check --repair'

[Stefan Hajnoczi]

On Tue, Mar 25, 2014 at 12:08:54AM +0530, Prasad Joshi wrote:
> qemu-img check --repair option accepts an argument. The argument to
> --repair switch can either be 'all' or 'leak'. Fix the long option to
> mandate argument with --repair switch.
> 
> The patch fixes following segmentation fault
> 
> Core was generated by `qemu-img check -f qcow2 --repair all t.qcow2'.
> Program terminated with signal 11, Segmentation fault.
> 0  in img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
> 588	            if (!strcmp(optarg, "leaks")) {
> (gdb) bt
>   0  img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588
>   1  __libc_start_main () from /lib/x86_64-linux-gnu/libc.so.6
>   2  _start ()
> (gdb)
> 
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  qemu-img.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan