From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIIf-0002py-Vz for qemu-devel@nongnu.org; Wed, 30 Mar 2016 11:44:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alIIe-0002JD-Qd for qemu-devel@nongnu.org; Wed, 30 Mar 2016 11:44:53 -0400 References: <1459345997-1610-1-git-send-email-berrange@redhat.com> <1459345997-1610-2-git-send-email-berrange@redhat.com> From: Max Reitz Message-ID: <56FBF469.2000106@redhat.com> Date: Wed, 30 Mar 2016 17:44:41 +0200 MIME-Version: 1.0 In-Reply-To: <1459345997-1610-2-git-send-email-berrange@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="vr6awuQP5FNmotT8N5W2si6ih5o1BANIB" Subject: Re: [Qemu-devel] [PATCH v7 1/3] block: add support for --image-opts in block I/O tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vr6awuQP5FNmotT8N5W2si6ih5o1BANIB Content-Type: multipart/mixed; boundary="ff2urdVEP1o0usiWlHdQjUA4SBO0uq1xn" From: Max Reitz To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf Message-ID: <56FBF469.2000106@redhat.com> Subject: Re: [PATCH v7 1/3] block: add support for --image-opts in block I/O tests References: <1459345997-1610-1-git-send-email-berrange@redhat.com> <1459345997-1610-2-git-send-email-berrange@redhat.com> In-Reply-To: <1459345997-1610-2-git-send-email-berrange@redhat.com> --ff2urdVEP1o0usiWlHdQjUA4SBO0uq1xn Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable 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. >=20 > This introduces a new env variable IMGOPTSSYNTAX. If this is > set to 'true', then qemu-img/qemu-io should use --image-opts. >=20 > 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(-) >=20 > 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=3DIMGFMT size=3D1= 34217728 > 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}" =3D= =3D "y" ]; then > - exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > + exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 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=3D0 reference=3D1 > @@ -51,9 +51,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1= 34217728 > 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}" =3D= =3D "y" ]; then > - exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > + exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 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=3D0 reference=3D1 > @@ -69,9 +69,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1= 34217728 > 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}" =3D= =3D "y" ]; then > - exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > + exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 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=3DIMGFMT size=3D1= 34217728 > 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}" =3D= =3D "y" ]; then > - exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > + exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 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=3D0 reference=3D1 > @@ -106,9 +106,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D= 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}" =3D= =3D "y" ]; then > - exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 99 "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@"; > + exec valgrind --log-file=3D"${VALGRIND_LOGFILE}" --error-exitcode=3D= 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. Max --ff2urdVEP1o0usiWlHdQjUA4SBO0uq1xn-- --vr6awuQP5FNmotT8N5W2si6ih5o1BANIB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJW+/RpAAoJEDuxQgLoOKytDdwH/3Mwmu5/RPTgfbxzQk3okne1 lc+4fUt4Smjiyx62MrlWZHexXnNX6V9IkLJXxkXUhKRnLRHmRnUBnXbUdHvDMEYr 5L2XbJoPb1+lleKKDabb+0GhJRhvcM2quSnhXJxmPLh5PdBLud2rIAjjy7TpDkuX jrg1V6mV2Frnedy00vikDK5bAmVDV+TODuOKrK3VU44IhPIHKlIeSP+DAFiqIgUr oRrTj7HAa+u+ldGtp58sFUGukIFkQeFsRAh7xOrWxTmfLPO/yfP7HYv8RixggT55 KcsoYn8w9X1hNCl33d4Ak0fBhabWhoZrU1RnNGAB+7/rLJbhHv7tbk9O7TMJH+M= =ztZE -----END PGP SIGNATURE----- --vr6awuQP5FNmotT8N5W2si6ih5o1BANIB--