diff options
author | Denis V. Lunev <den@openvz.org> | 2016-07-04 16:16:48 +0300 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2016-07-05 16:46:24 +0200 |
commit | cfef6a45c7201c8219d819d792e5d99bbff32308 (patch) | |
tree | 407b74b5b1ecd5eb1abc3e5e52ddbf4d6684714d | |
parent | 60a0f1af07d685c88f4ffa09370da5bd7514823e (diff) | |
download | qemu-cfef6a45c7201c8219d819d792e5d99bbff32308.tar.gz qemu-cfef6a45c7201c8219d819d792e5d99bbff32308.tar.bz2 qemu-cfef6a45c7201c8219d819d792e5d99bbff32308.zip |
qemu-img: fix failed autotests
There are 9 iotests failed on Ubuntu 15.10 at the moment.
The problem is that options parsing in qemu-img is broken by the
following commit:
commit 10985131e337a0c52c5bd1e191fd7867a6ff8d02
Author: Denis V. Lunev <den@openvz.org>
Date: Fri Jun 17 17:44:13 2016 +0300
qemu-img: move common options parsing before commands processing
This strange command line reports error
./qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- 1024
qemu-img: Invalid image size specified!
while original code parses it successfully.
The problem is that getopt_long state should be reset. This could be done
using this assignment according to the manual:
optind = 0
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r-- | qemu-img.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c index 3322a1e5fc..235168646e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3866,7 +3866,7 @@ int main(int argc, char **argv) return 0; } argv += optind; - optind = 1; + optind = 0; if (!trace_init_backends()) { exit(1); |