From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1WSEwt-0006IV-38 for mharc-qemu-trivial@gnu.org; Mon, 24 Mar 2014 20:10:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSA5C-0001Ng-OP for qemu-trivial@nongnu.org; Mon, 24 Mar 2014 14:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSA50-00041f-Cx for qemu-trivial@nongnu.org; Mon, 24 Mar 2014 14:58:50 -0400 Received: from mail-oa0-f44.google.com ([209.85.219.44]:65509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSA50-00041G-7n for qemu-trivial@nongnu.org; Mon, 24 Mar 2014 14:58:38 -0400 Received: by mail-oa0-f44.google.com with SMTP id n16so6356146oag.17 for ; Mon, 24 Mar 2014 11:58:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=xyHzywKWrosAtnTooAO0/pmUGo/C5L95uijtDqFtO7Q=; b=Y/Niu1n1hoQ1pf1howr4nTFkUPY0ddWQAAdRt/p7yoUNyGhmNdj2K82Rgd1ssaaV58 wZhWFcad5itY3Ca5znkbUVN5tCdxTfI8nCn0mxo0VSy4uPoaZwjbxur3SYqD3PL/1jBB 8EFq1aTXyf+yzOLEhzIlABk/zDg88DKFP6EvyApjigK1G9btBwPE2UChbsagig3D3DkY v0nhJTbUrLzpB7K7Tnc8KO50PqQbtYK6YCQLZPTGSXY4lM6mC7pgR7whZFt7UtsLXsDE lfhqLKgGRrTEhfvI7xAQI+jDFVqkgDsUigt20pP12LH3XN76B3nzCqDpwYdeRa4T6YBn 1wIw== X-Gm-Message-State: ALoCoQmg3I7SLaGtIrJzT6iVPMRa24Tnby6FaIEahjVMYIB8l5OzZv6obkRK0ilImTrjKLrThhJz X-Received: by 10.182.126.167 with SMTP id mz7mr2586260obb.69.1395687517371; Mon, 24 Mar 2014 11:58:37 -0700 (PDT) Received: from dorilex ([2001:4800:7815:102:1861:4901:ff05:6940]) by mx.google.com with ESMTPSA id wy2sm19620057obc.21.2014.03.24.11.58.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Mar 2014 11:58:36 -0700 (PDT) Date: Mon, 24 Mar 2014 18:57:11 +0000 From: Leandro Dorileo To: Prasad Joshi 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> User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.219.44 X-Mailman-Approved-At: Mon, 24 Mar 2014 20:10:33 -0400 Cc: kwolf@redhat.com, qemu-trivial@nongnu.org, pl@kamp.de, qemu-devel@nongnu.org, stefanha@redhat.com, pbonzini@redhat.com Subject: Re: [Qemu-trivial] [Qemu-devel] [PATCH] qemu-img: mandate argument to 'qemu-img check --repair' X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Mar 2014 18:58:56 -0000 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 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