Commit 228b234d authored by Jeff Cody's avatar Jeff Cody Committed by Stefan Hajnoczi
Browse files

block: vhdx - update _make_test_img() to filter out vhdx options 



The non-global option output is suppresed in _make_test_img() for
output verification in the 0?? tests.  This adds suppression for
the vhdx-unique options as well.  This allows check -vhdx to run
successfully.

Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 3412f7b1

tests/qemu-iotests/common.rc

+4 −1
Original line number Diff line number Diff line
@@ -157,7 +157,10 @@ _make_test_img() 
            -e "s# zeroed_grain=\\(on\\|off\\)##g" \

            -e "s# subformat='[^']*'##g" \

            -e "s# adapter_type='[^']*'##g" \

            -e "s# lazy_refcounts=\\(on\\|off\\)##g"

            -e "s# lazy_refcounts=\\(on\\|off\\)##g" \

            -e "s# block_size=[0-9]\\+##g" \

            -e "s# block_state_zero=\\(on\\|off\\)##g" \

            -e "s# log_size=[0-9]\\+##g"



    # Start an NBD server on the image file, which is what we'll be talking to

    if [ $IMGPROTO = "nbd" ]; then