[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0 2/5] qemu-img: mandate argument to 'qemu-img
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.0 2/5] qemu-img: mandate argument to 'qemu-img check --repair' |
Date: |
Tue, 25 Mar 2014 15:49:29 +0100 |
From: Prasad Joshi <address@hidden>
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 <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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.5.3
- [Qemu-devel] [PULL for-2.0 0/5] Block patches, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 0/5] Block patches, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 4/5] mirror: fix throttling delay calculation, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 1/5] osdep: initialize glib threads in all QEMU tools, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 5/5] mirror: fix early wake from sleep due to aio, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 2/5] qemu-img: mandate argument to 'qemu-img check --repair', Stefan Hajnoczi, 2014/03/25
- Re: [Qemu-devel] [PULL for-2.0 0/5] Block patches, Stefan Hajnoczi, 2014/03/25
- [Qemu-devel] [PULL for-2.0 3/5] Fixed various typos, Stefan Hajnoczi, 2014/03/25