On 03.12.2015 11:01, Bo Tu wrote: > From: Bo Tu <t...@linux.vnet.ibm.com> > > v4: > 1. Remove 051.s390.out, and rollback the changes in Makefile to generate > 051.s390-ccw-virtio.out > 2. Use 051.out as the common output for any non-pc platform > 3. Set device_id to "drive0", and replace every "-drive file..." > by "-drive file=...,if=none,id=$device_id", then x86 and s390x > can get the common output in the test of "Snapshot mode" for test 051 > 4. Update 051.out and 051.pc.out > > v3: > 1. Remove patch for test 120 because Fam Zheng upstreamed same fix for > test 119 and 120 > 2. Rename 051.out to 051.s390.out, add rule in Makefile to generate > 051.s390-ccw-virtio.out > 3. Remove superfluous quotation marks in common.config > 4. Add "Acked-by: Max Reitz <mre...@redhat.com>" for test 068, > add "Reviewed-by: Max Reitz <mre...@redhat.com>" for test 051 and > common.config > > v2: > 1. Refine common.config via changing the definition of default_alias_machine > and default_machine > 2. Add Reviewed-by of Eric Blake for common.config > > v1: > 1. Refine common.config > 2. Update the output file for test 051 based on its current > output for s390 platform, add a pc specific output file for test 051 > 3. checkpatch.pl reports invaid UTF-8 error for 051 patch, > because its output files contain some non-text data > 4. Add the parameter of "-no-shutdown -machine accel=kvm" for > s390-ccw-virtio for test 068 > 5. Disable VNC server for test 120 > > Bo Tu (3): > qemu-iotests: refine common.config > qemu-iotests: s390x: fix test 051 > qemu-iotests: s390x: fix test 068 > > tests/qemu-iotests/051 | 95 +++++---- > tests/qemu-iotests/051.out | 163 ++++----------- > tests/qemu-iotests/051.pc.out | 422 > +++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/068 | 14 +- > tests/qemu-iotests/common.config | 9 +- > 5 files changed, 537 insertions(+), 166 deletions(-) > create mode 100644 tests/qemu-iotests/051.pc.out
Thanks, applied patches 1 and 3 to my block-next branch: https://github.com/XanClic/qemu/commits/block-next (And I will apply patch 2, too, depending on whether you agree to send a follow-up to it or respin once more.) Max
signature.asc
Description: OpenPGP digital signature