From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJO5l-0007Gj-PQ for qemu-devel@nongnu.org; Thu, 05 Feb 2015 10:11:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJO5g-0007M5-OW for qemu-devel@nongnu.org; Thu, 05 Feb 2015 10:11:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJO5g-0007Lx-EN for qemu-devel@nongnu.org; Thu, 05 Feb 2015 10:11:36 -0500 Message-ID: <54D38823.2050709@redhat.com> Date: Thu, 05 Feb 2015 10:11:31 -0500 From: Max Reitz MIME-Version: 1.0 References: <1423107872-3268-1-git-send-email-chenxg@linux.vnet.ibm.com> <1423107872-3268-6-git-send-email-chenxg@linux.vnet.ibm.com> In-Reply-To: <1423107872-3268-6-git-send-email-chenxg@linux.vnet.ibm.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH RFC v4 5/6] qemu-iotests: s390x: fix test 051 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Xiao Guang Chen , qemu-devel@nongnu.org Cc: kwolf@redhat.com, mimu@linux.vnet.ibm.com, armbru@redhat.com On 2015-02-04 at 22:44, Xiao Guang Chen wrote: > From: Mao Chuan Li > > The tests for device type "ide_cd" are skipped for the s390 platform. > The default device id of hard disk on the s390 platform differs to that= > of the x86 platform. A new variable device_id is defined and "virtio0" > set for the s390 platform. A s390 platform specific output file is also= > needed. > > Reviewed-by: Michael Mueller > Signed-off-by: Mao Chuan Li > --- > tests/qemu-iotests/051 | 91 +++++--- > tests/qemu-iotests/051.s390-virtio.out | 377 ++++++++++++++++++++++++= +++++++++ > 2 files changed, 439 insertions(+), 29 deletions(-) > create mode 100644 tests/qemu-iotests/051.s390-virtio.out First: This patch contains lines which are too long to be sent via email = (they are broken up and thus the patch needs manual fixup by the=20 reviewers). If you could specify a public repository where we could pull = from, that may be helpful to the reviewers. Second: I'm not sure whether s390-virtio should be the special case=20 here. Maybe "pc" is the platform that is actually special because it=20 contains a floppy drive, an IDE CD drive and so on. So while this patch=20 is (nearly?) correct, it may make more sense to move 051.out to=20 051.pc.out and modify the current 051.out to be what is=20 051.s390-virtio.out in this patch. In the same way, maybe all the conditionals in this series (not just=20 this patch) which check whether the machine type is s390-virtio should=20 maybe instead check whether the machine type is not pc. However, the problem with the pc machine type is that=20 QEMU_DEFAULT_MACHINE will be version-dependent (currently, it's=20 pc-i440fx-2.3), so that would require a workaround. [snip] > diff --git a/tests/qemu-iotests/051.s390-virtio.out b/tests/qemu-iotest= s/051.s390-virtio.out > new file mode 100644 > index 0000000..751670f > --- /dev/null > +++ b/tests/qemu-iotests/051.s390-virtio.out > @@ -0,0 +1,377 @@ > +QA output created by 051 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 backing_= file=3D'TEST_DIR/t.IMGFMT.base' > + > +=3D=3D=3D Unknown option =3D=3D=3D > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D= : could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' used b= y device 'virtio0' doesn't support the option 'unknown_opt' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3Do= n > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D= on: could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' used= by device 'virtio0' doesn't support the option 'unknown_opt' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D1= 234 > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D= 1234: could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' us= ed by device 'virtio0' doesn't support the option 'unknown_opt' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3Df= oo > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D= foo: could not open disk image TEST_DIR/t.qcow2: Block format 'qcow2' use= d by device 'virtio0' doesn't support the option 'unknown_opt' > + > + > +=3D=3D=3D Unknown protocol option =3D=3D=3D > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_op= t=3D > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_= opt=3D: could not open disk image TEST_DIR/t.qcow2: Block protocol 'file'= doesn't support the option 'unknown_opt' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_op= t=3Don > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_= opt=3Don: could not open disk image TEST_DIR/t.qcow2: Block protocol 'fil= e' doesn't support the option 'unknown_opt' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_op= t=3D1234 > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_= opt=3D1234: could not open disk image TEST_DIR/t.qcow2: Block protocol 'f= ile' doesn't support the option 'unknown_opt' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_op= t=3Dfoo > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_= opt=3Dfoo: could not open disk image TEST_DIR/t.qcow2: Block protocol 'fi= le' doesn't support the option 'unknown_opt' > + > + > +=3D=3D=3D Invalid format =3D=3D=3D > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dfoo > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dfoo: 'foo' invalid = format > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Dfoo > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Dfoo: could not open= disk image TEST_DIR/t.qcow2: Unknown driver 'foo' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,format=3Dqcow2 > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,format=3Dqcow2:= could not open disk image TEST_DIR/t.qcow2: Driver specified twice > + > + > +=3D=3D=3D Overriding backing file =3D=3D=3D > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow2,backing.file.fi= lename=3DTEST_DIR/t.qcow2.orig -nodefaults > +QEMU X.Y.Z monitor - type 'help' for more information > +(qemu) i=1B[K=1B[Din=1B[K=1B[D=1B[Dinf=1B[K=1B[D=1B[D=1B[Dinfo=1B[K=1B= [D=1B[D=1B[D=1B[Dinfo =1B[K=1B[D=1B[D=1B[D=1B[D=1B[Dinfo b=1B[K=1B[D=1B[D= =1B[D=1B[D=1B[D=1B[Dinfo bl=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dinfo b= lo=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dinfo bloc=1B[K=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dinfo block=1B[K > +virtio0: TEST_DIR/t.qcow2 (qcow2) > + Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1) > +(qemu) q=1B[K=1B[Dqu=1B[K=1B[D=1B[Dqui=1B[K=1B[D=1B[D=1B[Dquit=1B[K > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.file= name=3DTEST_DIR/t.qcow2.orig > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.fi= lename=3DTEST_DIR/t.qcow2.orig: could not open disk image TEST_DIR/t.qcow= 2: Driver doesn't support backing files > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dfile,fil= e.backing.filename=3DTEST_DIR/t.qcow2.orig > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dfile,f= ile.backing.filename=3DTEST_DIR/t.qcow2.orig: could not open disk image T= EST_DIR/t.qcow2: Driver doesn't support backing files > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dqcow2,fi= le.backing.file.filename=3DTEST_DIR/t.qcow2.orig > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dqcow2,= file.backing.file.filename=3DTEST_DIR/t.qcow2.orig: could not open disk i= mage TEST_DIR/t.qcow2: Driver doesn't support backing files > + > + > +=3D=3D=3D Enable and disable lazy refcounting on the command line, plu= s some invalid values =3D=3D=3D > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= on > +QEMU X.Y.Z monitor - type 'help' for more information > +(qemu) q=1B[K=1B[Dqu=1B[K=1B[D=1B[Dqui=1B[K=1B[D=1B[D=1B[Dquit=1B[K > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= off > +QEMU X.Y.Z monitor - type 'help' for more information > +(qemu) q=1B[K=1B[Dqu=1B[K=1B[D=1B[Dqui=1B[K=1B[D=1B[D=1B[Dquit=1B[K > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcount= s=3D: could not open disk image TEST_DIR/t.qcow2: Parameter 'lazy-refcoun= ts' expects 'on' or 'off' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= 42 > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcount= s=3D42: could not open disk image TEST_DIR/t.qcow2: Parameter 'lazy-refco= unts' expects 'on' or 'off' > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= foo > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcount= s=3Dfoo: could not open disk image TEST_DIR/t.qcow2: Parameter 'lazy-refc= ounts' expects 'on' or 'off' > + > + > +=3D=3D=3D With version 2 images enabling lazy refcounts must fail =3D=3D= =3D > + > +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= on > +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcount= s=3Don: could not open disk image TEST_DIR/t.qcow2: Lazy refcounts requir= e a qcow2 image with at least qemu 1.1 compatibility level > + > +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= off > +QEMU X.Y.Z monitor - type 'help' for more information > +(qemu) q=1B[K=1B[Dqu=1B[K=1B[D=1B[Dqui=1B[K=1B[D=1B[D=1B[Dquit=1B[K > + > + > +=3D=3D=3D No medium =3D=3D=3D > + > +Testing: -drive if=3Dfloppy > +QEMU X.Y.Z monitor - type 'help' for more information > +(qemu) Warning: Orphaned drive without device: id=3Dfloppy0,file=3D,if= =3Dfloppy,bus=3D0,unit=3D0 > +q=1B[K=1B[Dqu=1B[K=1B[D=1B[Dqui=1B[K=1B[D=1B[D=1B[Dquit=1B[K Can't we get rid of these warnings somehow? If nothing else works,=20 filter them out? [snip] > +=3D=3D=3D Snapshot mode =3D=3D=3D > + > +wrote 4096/4096 bytes at offset 0 > +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +Testing: -drive file=3DTEST_DIR/t.qcow2 -snapshot > +QEMU X.Y.Z monitor - type 'help' for more information > +(qemu) q=1B[K=1B[Dqe=1B[K=1B[D=1B[Dqem=1B[K=1B[D=1B[D=1B[Dqemu=1B[K=1B= [D=1B[D=1B[D=1B[Dqemu-=1B[K=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-i=1B[K=1B[D=1B[D= =1B[D=1B[D=1B[D=1B[Dqemu-io=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-i= o =1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io v=1B[K=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io vi=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[Dqemu-io vir=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D= =1B[D=1B[D=1B[D=1B[Dqemu-io virt=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[Dqemu-io virti=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio=1B[K=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0=1B[K=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-i= o virtio0 =1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[= D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "= w=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "wr=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-i= o virtio0 "wri=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[= D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "writ=1B[K=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D! > =1B[D=1B[Dqemu-io virtio0 "write=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [Dqemu-io virtio0 "write =1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dq= emu-io virtio0 "write -=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D= =1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [Dqemu-io virtio0 "write -P=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[Dqemu-io virtio0 "write -P =1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D= =1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "write -P 0=1B[K=1B[D=1B[D=1B[D=1B[= D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "write -P 0x=1B= [K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-i= o virtio0 "write -P 0x2=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D= =1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "write -P 0x22=1B[K=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io vir= tio0 "wr! > ite -P 0x22 =1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "write -P 0x22 0=1B[K=1B[D=1B[= D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [Dqemu-io virtio0 "write -P 0x22 0 =1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 = "write -P 0x22 0 4=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D= =1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "write -P = 0x22 0 4k=1B[K=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[= D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B= [D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[D=1B[Dqemu-io virtio0 "write -P 0x22 = 0 4k"=1B[K This is an example of a line that got split into multiple lines in the=20 email. It's fixable by the reviewer, but that requires work. :-) Max