Several of the mmp tests were failing on an s390 guest because direct IO cannot be done on sub-sector sizes, and they were doing 1k IOs to files on a 4k logical/physical device. A few tests could just be changed to 4k, but others needed fixed up output as well. With this I have all tests passing on s390 again. Signed-off-by: Eric Sandeen --- (attaching patch to deal with ctrl characters in patch)