]> git.proxmox.com Git - mirror_qemu.git/commit
qemu-img: fix failed autotests
authorDenis V. Lunev <den@openvz.org>
Mon, 4 Jul 2016 13:16:48 +0000 (16:16 +0300)
committerKevin Wolf <kwolf@redhat.com>
Tue, 5 Jul 2016 14:46:24 +0000 (16:46 +0200)
commitcfef6a45c7201c8219d819d792e5d99bbff32308
tree407b74b5b1ecd5eb1abc3e5e52ddbf4d6684714d
parent60a0f1af07d685c88f4ffa09370da5bd7514823e
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>
qemu-img.c