From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSA55-0001Fr-Po for qemu-devel@nongnu.org; Mon, 24 Mar 2014 14:58:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSA50-00041a-CW for qemu-devel@nongnu.org; Mon, 24 Mar 2014 14:58:43 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]:41911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSA50-00041H-7l for qemu-devel@nongnu.org; Mon, 24 Mar 2014 14:58:38 -0400 Received: by mail-ob0-f180.google.com with SMTP id wn1so6232470obc.39 for ; Mon, 24 Mar 2014 11:58:37 -0700 (PDT) Date: Mon, 24 Mar 2014 18:57:11 +0000 From: Leandro Dorileo Message-ID: <20140324185711.GA1563@dorilex> References: <1395686334-9498-1-git-send-email-prasadjoshi.linux@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1395686334-9498-1-git-send-email-prasadjoshi.linux@gmail.com> Subject: Re: [Qemu-devel] [PATCH] qemu-img: mandate argument to 'qemu-img check --repair' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Prasad Joshi Cc: kwolf@redhat.com, qemu-trivial@nongnu.org, pl@kamp.de, qemu-devel@nongnu.org, stefanha@redhat.com, pbonzini@redhat.com 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 Patch looks good to me. Reviewed-by: Leandro Dorileo > --- > 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