On Sun, Jun 08, 2014 at 09:08:57PM -0600, Chun Yan Liu wrote: > >>> On 6/5/2014 at 09:28 PM, in message > <20140605132857.ga8...@stefanha-thinkpad.redhat.com>, Stefan Hajnoczi > <stefa...@gmail.com> wrote: > > On Thu, Jun 05, 2014 at 05:20:39PM +0800, Chunyan Liu wrote: > > > This patch series is to replace QEMUOptionParameter with QemuOpts, so > > > that > > only > > > one Qemu Option structure is kept in QEMU code. > > > > > > --- > > > Changes to v27: > > > * rebase to git master (code has been updated in this part since v27 > > > sent > > > so rebase to make the patch series work.) > > > > This series causes two qemu-iotests failures. For info on qemu-iotests: > > http://qemu-project.org/Documentation/QemuIoTests > > > > Luckily they look easy to fix, they are just differences in error > > messages. Please preserve error messages where possible, and otherwise > > just update the test .out file. > > > > When resolving these test failures, please make sure to keep > > bisectability by squashing the fix where the failure was introduced > > instead of adding new patches to the end of the series. > > > > 049 6s ... - output mismatch (see 049.out.bad) > > --- 049.out 2014-06-05 15:04:21.952358444 +0200 > > +++ 049.out.bad 2014-06-05 15:11:29.143000551 +0200 > > @@ -120,7 +120,7 @@ > > > > qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2 > > qemu-img: Parameter 'size' expects a size > > -qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2' > > +qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'. > > > > == Check correct interpretation of suffixes for cluster size == > > > > 061 7s ... - output mismatch (see 061.out.bad) > > --- 061.out 2014-06-05 15:04:21.952358444 +0200 > > +++ 061.out.bad 2014-06-05 15:12:08.024050567 +0200 > > @@ -281,7 +281,7 @@ > > qemu-img: Error while amending options: Invalid argument > > Unknown compatibility level 0.42. > > qemu-img: Error while amending options: Invalid argument > > -qemu-img: Invalid parameter 'foo' > > +Unknown option 'foo' > > qemu-img: Invalid options for file format 'qcow2' > > Changing the cluster size is not supported. > > qemu-img: Error while amending options: Operation not supported > > > Hi, Stefan, > I'm confused about this mismatch. The mismatch error messages are just > those are updated in 12/33, which should be correct I think and there are > no failure in my testing 'make check-block'. How do you encounter those > failure? > > PS: > 049.out: error message should not be ended with '.', I updated two places > in 12/33 and updated 049.out to match that. > 061.out: old code uses QEMUOptionParameter, that prints "Unknown option > 'foo'". > new code uses QemuOpts, which prints Invalid parameter 'foo'. > So I > correct that in 061.out.
You are right. I wonder if I ran qemu-iotests on v27 by mistake. In any case, I reran git bisect -x 'make && cd tests/qemu-iotests && ./check -qcow2 049 061' to confirm that they pass with the v28 patch series. Looks good. Stefan
pgptP7ZDnysp_.pgp
Description: PGP signature
