From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIPs-0008B7-Ar for qemu-devel@nongnu.org; Wed, 30 Mar 2016 11:52:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alIPn-00058S-Vv for qemu-devel@nongnu.org; Wed, 30 Mar 2016 11:52:20 -0400 Date: Wed, 30 Mar 2016 16:52:07 +0100 From: "Daniel P. Berrange" Message-ID: <20160330155207.GI12311@redhat.com> References: <1459345997-1610-1-git-send-email-berrange@redhat.com> <1459345997-1610-2-git-send-email-berrange@redhat.com> <56FBF469.2000106@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <56FBF469.2000106@redhat.com> Subject: Re: [Qemu-devel] [PATCH v7 1/3] block: add support for --image-opts in block I/O tests Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , qemu-devel@nongnu.org, qemu-block@nongnu.org On Wed, Mar 30, 2016 at 05:44:41PM +0200, Max Reitz wrote: > On 30.03.2016 15:53, Daniel P. Berrange wrote: > > Currently all block tests use the traditional syntax for images > > just specifying a filename. To support the LUKS driver without > > resorting to JSON, the tests need to be able to use the new > > --image-opts argument to qemu-img and qemu-io. > > > > This introduces a new env variable IMGOPTSSYNTAX. If this is > > set to 'true', then qemu-img/qemu-io should use --image-opts. > > > > Signed-off-by: Daniel P. Berrange > > --- > > tests/qemu-iotests/039.out | 20 +++++++------- > > tests/qemu-iotests/common | 7 ++++- > > tests/qemu-iotests/common.config | 15 +++++++++-- > > tests/qemu-iotests/common.rc | 57 +++++++++++++++++++++++++++++----------- > > 4 files changed, 71 insertions(+), 28 deletions(-) > > > > diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out > > index 32c8846..c6e0ac2 100644 > > --- a/tests/qemu-iotests/039.out > > +++ b/tests/qemu-iotests/039.out > > @@ -12,9 +12,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 > > wrote 512/512 bytes at offset 0 > > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then > > - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > else > > - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > fi ) > > incompatible_features 0x1 > > ERROR cluster 5 refcount=0 reference=1 > > @@ -51,9 +51,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 > > wrote 512/512 bytes at offset 0 > > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then > > - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > else > > - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > fi ) > > incompatible_features 0x1 > > ERROR cluster 5 refcount=0 reference=1 > > @@ -69,9 +69,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 > > wrote 512/512 bytes at offset 0 > > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then > > - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > else > > - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > fi ) > > incompatible_features 0x0 > > No errors were found on the image. > > @@ -92,9 +92,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 > > wrote 512/512 bytes at offset 0 > > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then > > - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > else > > - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > fi ) > > incompatible_features 0x1 > > ERROR cluster 5 refcount=0 reference=1 > > @@ -106,9 +106,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 > > wrote 512/512 bytes at offset 0 > > 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then > > - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > else > > - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > > + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"; > > fi ) > > incompatible_features 0x0 > > No errors were found on the image. > > I think 061 and 137 need the same treatment. > > Looks good apart from that. FWIW, I didn't attempt to update those because they're qcow2 only. I only tried to update tests which were (potentially) runnable with the luks block driver. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|