From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1WS9mk-0006sV-Jg for mharc-qemu-trivial@gnu.org; Mon, 24 Mar 2014 14:39:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WS9mY-0006do-Q3 for qemu-trivial@nongnu.org; Mon, 24 Mar 2014 14:39:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WS9mQ-0006L0-4h for qemu-trivial@nongnu.org; Mon, 24 Mar 2014 14:39:34 -0400 Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:50132) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WS9m8-0006Bu-SJ; Mon, 24 Mar 2014 14:39:09 -0400 Received: by mail-pd0-f175.google.com with SMTP id x10so5688588pdj.34 for ; Mon, 24 Mar 2014 11:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=cFAUQUxOayY1Pi95gEOZUCdkJrwDm4Uq04cniara73o=; b=FzQ4KceXWaGvRDOAi427ML3gDNG8At/Y0iT67TbKDdTNi9Vr14Zp0si9AXkrV0+lzE xu1E16eIUbbggtIYAEDxYBWoH7A66IhyL21bcIlUPAhmR+urI2QaiD32TpKf4GGgMbmQ 0NAZBkuJES4rTeoeNpF0eU53lynAjyous1oObzjz+JxRioDkAlxX881c5fL4SAoAZwtp +w2WM8x1d3uurZMazK9YyjlA32Mo/jy4L6Ecq21YwnjkUx0uEPK99mXve9LCfkU6e+Jw nRcC1XdH0BPxW62QN4DThewonI+gRRloFQXFDlPILnjE4P/Rg6srzyCVAToRmdzN7ft9 0ZNQ== X-Received: by 10.68.171.229 with SMTP id ax5mr74312500pbc.125.1395686347813; Mon, 24 Mar 2014 11:39:07 -0700 (PDT) Received: from prasad-desktop ([117.195.10.12]) by mx.google.com with ESMTPSA id gj9sm34594603pbc.7.2014.03.24.11.39.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Mar 2014 11:39:06 -0700 (PDT) Received: by prasad-desktop (Postfix, from userid 1000) id D7ED2A0075A; Tue, 25 Mar 2014 00:08:54 +0530 (IST) From: Prasad Joshi To: prasadjoshi.linux@gmail.com Date: Tue, 25 Mar 2014 00:08:54 +0530 Message-Id: <1395686334-9498-1-git-send-email-prasadjoshi.linux@gmail.com> X-Mailer: git-send-email 1.8.1.2 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22f Cc: kwolf@redhat.com, qemu-trivial@nongnu.org, pl@kamp.de, qemu-devel@nongnu.org, stefanha@redhat.com, pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-trivial] [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:39:44 -0000 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 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WS9mH-0006T5-HN for qemu-devel@nongnu.org; Mon, 24 Mar 2014 14:39:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WS9m9-0006By-4U for qemu-devel@nongnu.org; Mon, 24 Mar 2014 14:39:17 -0400 From: Prasad Joshi Date: Tue, 25 Mar 2014 00:08:54 +0530 Message-Id: <1395686334-9498-1-git-send-email-prasadjoshi.linux@gmail.com> Subject: [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: prasadjoshi.linux@gmail.com Cc: kwolf@redhat.com, qemu-trivial@nongnu.org, pl@kamp.de, qemu-devel@nongnu.org, stefanha@redhat.com, pbonzini@redhat.com 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 --- 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