Commit e121034d authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Fix 067 for compat=0.10 



067 works very well with compat=0.10 once you remove format-specific
information from the QMP output.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20171123020832.8165-14-mreitz@redhat.com
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 76bf133c

tests/qemu-iotests/067

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ function run_qemu() 
{

    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \

                          | _filter_actual_image_size \

                          | _filter_generated_node_ids | _filter_qmp_events

                          | _filter_generated_node_ids | _filter_qmp_events \

                          | _filter_img_info

}



size=128M

tests/qemu-iotests/067.out

+26 −71
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 


=== -drive/-device and device_del ===



Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0

Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0

{

    QMP_VERSION

}
@@ -23,26 +23,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti 
                "detect_zeroes": "off",

                "image": {

                    "virtual-size": 134217728,

                    "filename": "TEST_DIR/t.qcow2",

                    "filename": "TEST_DIR/t.IMGFMT",

                    "cluster-size": 65536,

                    "format": "qcow2",

                    "format": "IMGFMT",

                    "actual-size": SIZE,

                    "format-specific": {

                        "type": "qcow2",

                        "data": {

                            "compat": "1.1",

                            "lazy-refcounts": false,

                            "refcount-bits": 16,

                            "corrupt": false

                        }

                    },

                    "dirty-flag": false

                },

                "iops_wr": 0,

                "ro": false,

                "node-name": "NODE_NAME",

                "backing_file_depth": 0,

                "drv": "qcow2",

                "drv": "IMGFMT",

                "iops": 0,

                "bps_wr": 0,

                "write_threshold": 0,
@@ -54,7 +45,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti 
                    "direct": false,

                    "writeback": true

                },

                "file": "TEST_DIR/t.qcow2",

                "file": "TEST_DIR/t.IMGFMT",

                "encryption_key_missing": false

            },

            "qdev": "/machine/peripheral/virtio0/virtio-backend",
@@ -81,7 +72,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti 


=== -drive/device_add and device_del ===



Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk

Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk

{

    QMP_VERSION

}
@@ -100,26 +91,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk 
                "detect_zeroes": "off",

                "image": {

                    "virtual-size": 134217728,

                    "filename": "TEST_DIR/t.qcow2",

                    "filename": "TEST_DIR/t.IMGFMT",

                    "cluster-size": 65536,

                    "format": "qcow2",

                    "format": "IMGFMT",

                    "actual-size": SIZE,

                    "format-specific": {

                        "type": "qcow2",

                        "data": {

                            "compat": "1.1",

                            "lazy-refcounts": false,

                            "refcount-bits": 16,

                            "corrupt": false

                        }

                    },

                    "dirty-flag": false

                },

                "iops_wr": 0,

                "ro": false,

                "node-name": "NODE_NAME",

                "backing_file_depth": 0,

                "drv": "qcow2",

                "drv": "IMGFMT",

                "iops": 0,

                "bps_wr": 0,

                "write_threshold": 0,
@@ -131,7 +113,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk 
                    "direct": false,

                    "writeback": true

                },

                "file": "TEST_DIR/t.qcow2",

                "file": "TEST_DIR/t.IMGFMT",

                "encryption_key_missing": false

            },

            "type": "unknown"
@@ -183,26 +165,17 @@ Testing: 
                "detect_zeroes": "off",

                "image": {

                    "virtual-size": 134217728,

                    "filename": "TEST_DIR/t.qcow2",

                    "filename": "TEST_DIR/t.IMGFMT",

                    "cluster-size": 65536,

                    "format": "qcow2",

                    "format": "IMGFMT",

                    "actual-size": SIZE,

                    "format-specific": {

                        "type": "qcow2",

                        "data": {

                            "compat": "1.1",

                            "lazy-refcounts": false,

                            "refcount-bits": 16,

                            "corrupt": false

                        }

                    },

                    "dirty-flag": false

                },

                "iops_wr": 0,

                "ro": false,

                "node-name": "NODE_NAME",

                "backing_file_depth": 0,

                "drv": "qcow2",

                "drv": "IMGFMT",

                "iops": 0,

                "bps_wr": 0,

                "write_threshold": 0,
@@ -214,7 +187,7 @@ Testing: 
                    "direct": false,

                    "writeback": true

                },

                "file": "TEST_DIR/t.qcow2",

                "file": "TEST_DIR/t.IMGFMT",

                "encryption_key_missing": false

            },

            "type": "unknown"
@@ -263,26 +236,17 @@ Testing: 
            "detect_zeroes": "off",

            "image": {

                "virtual-size": 134217728,

                "filename": "TEST_DIR/t.qcow2",

                "filename": "TEST_DIR/t.IMGFMT",

                "cluster-size": 65536,

                "format": "qcow2",

                "format": "IMGFMT",

                "actual-size": SIZE,

                "format-specific": {

                    "type": "qcow2",

                    "data": {

                        "compat": "1.1",

                        "lazy-refcounts": false,

                        "refcount-bits": 16,

                        "corrupt": false

                    }

                },

                "dirty-flag": false

            },

            "iops_wr": 0,

            "ro": false,

            "node-name": "disk",

            "backing_file_depth": 0,

            "drv": "qcow2",

            "drv": "IMGFMT",

            "iops": 0,

            "bps_wr": 0,

            "write_threshold": 0,
@@ -294,7 +258,7 @@ Testing: 
                "direct": false,

                "writeback": true

            },

            "file": "TEST_DIR/t.qcow2",

            "file": "TEST_DIR/t.IMGFMT",

            "encryption_key_missing": false

        },

        {
@@ -302,7 +266,7 @@ Testing: 
            "detect_zeroes": "off",

            "image": {

                "virtual-size": 197120,

                "filename": "TEST_DIR/t.qcow2",

                "filename": "TEST_DIR/t.IMGFMT",

                "format": "file",

                "actual-size": SIZE,

                "dirty-flag": false
@@ -323,7 +287,7 @@ Testing: 
                "direct": false,

                "writeback": true

            },

            "file": "TEST_DIR/t.qcow2",

            "file": "TEST_DIR/t.IMGFMT",

            "encryption_key_missing": false

        }

    ]
@@ -347,26 +311,17 @@ Testing: 
            "detect_zeroes": "off",

            "image": {

                "virtual-size": 134217728,

                "filename": "TEST_DIR/t.qcow2",

                "filename": "TEST_DIR/t.IMGFMT",

                "cluster-size": 65536,

                "format": "qcow2",

                "format": "IMGFMT",

                "actual-size": SIZE,

                "format-specific": {

                    "type": "qcow2",

                    "data": {

                        "compat": "1.1",

                        "lazy-refcounts": false,

                        "refcount-bits": 16,

                        "corrupt": false

                    }

                },

                "dirty-flag": false

            },

            "iops_wr": 0,

            "ro": false,

            "node-name": "disk",

            "backing_file_depth": 0,

            "drv": "qcow2",

            "drv": "IMGFMT",

            "iops": 0,

            "bps_wr": 0,

            "write_threshold": 0,
@@ -378,7 +333,7 @@ Testing: 
                "direct": false,

                "writeback": true

            },

            "file": "TEST_DIR/t.qcow2",

            "file": "TEST_DIR/t.IMGFMT",

            "encryption_key_missing": false

        },

        {
@@ -386,7 +341,7 @@ Testing: 
            "detect_zeroes": "off",

            "image": {

                "virtual-size": 197120,

                "filename": "TEST_DIR/t.qcow2",

                "filename": "TEST_DIR/t.IMGFMT",

                "format": "file",

                "actual-size": SIZE,

                "dirty-flag": false
@@ -407,7 +362,7 @@ Testing: 
                "direct": false,

                "writeback": true

            },

            "file": "TEST_DIR/t.qcow2",

            "file": "TEST_DIR/t.IMGFMT",

            "encryption_key_missing": false

        }

    ]