On 05.05.2017 23:06, Eric Blake wrote: > On 05/05/2017 03:58 PM, Max Reitz wrote: >> On 04.05.2017 05:07, Eric Blake wrote: >>> Although _filter_qemu_img_map documents that it scrubs offsets, it >>> was only doing so for human mode. Of the existing tests using the >>> filter (97, 122, 150, 154, 176), two of them are affected, but it >>> does not hurt the validity of the tests to not require particular >>> mappings (another test, 66, uses offsets but intentionally does not >>> pass through _filter_qemu_img_map, because it checks that offsets >>> are unchanged before and after an operation). >>> > >>> _filter_qemu_img_map() >>> { >>> sed -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \ >>> + -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \> -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt > > Whoa - mail corruption. > >> >> This makes my OCD very sad. > > The real culprit? TAB damage. I guess this is one of the files that > emacs thinks should be indented with TAB instead of space, because the >emacs Found the issue right there. O:-) Max > file itself looks aligned, only the patch is botched. > >> >> With the alignment fixed: >> >> Reviewed-by: Max Reitz >> >> (Without this fixed: Will-change-when-applying-and-then-add-the-R-b) > > Much appreciated, and I await the final verdict on whether I have to > respin (you've pointed out several cleanups I can make), or whether you > take the fixed version of these patches and let me write a few more > followups.