On 04.11.2015 03:26, Bo Tu wrote: > The tests for device type "ide_cd" should only be tested for the pc > 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 x86 platform specific output file is also > needed. > Warning message expected for s390x when drive without device. > > Reviewed-by: Sascha Silbe <si...@linux.vnet.ibm.com> > Signed-off-by: Bo Tu <t...@linux.vnet.ibm.com> > --- > tests/qemu-iotests/051 | 99 ++++++---- > tests/qemu-iotests/051.out | 143 +++----------- > tests/qemu-iotests/051.pc.out | 422 > ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 515 insertions(+), 149 deletions(-) > create mode 100644 tests/qemu-iotests/051.pc.out >
[...] > diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out > index 7765aa0..d17c969 100644 > --- a/tests/qemu-iotests/051.out > +++ b/tests/qemu-iotests/051.out [...] > @@ -109,20 +109,23 @@ QEMU X.Y.Z monitor - type 'help' for more information > > Testing: -drive if=floppy > QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K > +(qemu) Warning: Orphaned drive without device: > id=floppy0,file=,if=floppy,bus=0,unit=0 > +q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K I'd still like these warnings to be filtered out (as I wrote in my reply to the original RFC's v4, and as was done in later versions of that RFC (the _filter_orphan function e.g. in http://lists.nongnu.org/archive/html/qemu-devel/2015-05/msg04816.html). Looks good other than that. Max
signature.asc
Description: OpenPGP digital signature
