b4af1df08f
We need to let _img_info emit the format-specific information so we get
the list of bitmaps we want, but we do not need anything but the
bitmaps. So filter out everything that is irrelevant to us. (Ideally,
this would be a generalized function in common.filters that takes a list
of things to keep, but that would require implementing an anti-bitmap
filter, which would be hard, and which we do not need here. So that is
why this function is just a local hack.)
This lets 291 pass with qcow2 options like refcount_bits or data_file
again.
Fixes: 14f16bf947
("qemu-img: Support bitmap --merge into backing image")
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201027164416.144115-2-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
119 lines
3.7 KiB
Plaintext
119 lines
3.7 KiB
Plaintext
QA output created by 291
|
|
|
|
=== Initial image setup ===
|
|
|
|
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=10485760
|
|
wrote 1048576/1048576 bytes at offset 3145728
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=10485760 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
|
|
wrote 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
wrote 1048576/1048576 bytes at offset 3145728
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
wrote 1048576/1048576 bytes at offset 1048576
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
wrote 1048576/1048576 bytes at offset 2097152
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
=== Bitmap preservation not possible to non-qcow2 ===
|
|
|
|
qemu-img: Format driver 'raw' does not support bitmaps
|
|
|
|
=== Convert with bitmap preservation ===
|
|
|
|
image: TEST_DIR/t.IMGFMT
|
|
file format: IMGFMT
|
|
virtual size: 10 MiB (10485760 bytes)
|
|
cluster_size: 65536
|
|
Format specific information:
|
|
bitmaps:
|
|
[0]:
|
|
flags:
|
|
name: b1
|
|
granularity: 524288
|
|
[1]:
|
|
flags:
|
|
[0]: auto
|
|
name: b2
|
|
granularity: 65536
|
|
corrupt: false
|
|
image: TEST_DIR/t.IMGFMT
|
|
file format: IMGFMT
|
|
virtual size: 10 MiB (10485760 bytes)
|
|
cluster_size: 65536
|
|
Format specific information:
|
|
bitmaps:
|
|
[0]:
|
|
flags:
|
|
name: b1
|
|
granularity: 524288
|
|
[1]:
|
|
flags:
|
|
[0]: auto
|
|
name: b2
|
|
granularity: 65536
|
|
[2]:
|
|
flags:
|
|
name: b0
|
|
granularity: 65536
|
|
corrupt: false
|
|
|
|
=== Merge from top layer into backing image ===
|
|
|
|
image: TEST_DIR/t.IMGFMT
|
|
file format: IMGFMT
|
|
virtual size: 10 MiB (10485760 bytes)
|
|
cluster_size: 65536
|
|
backing file: TEST_DIR/t.IMGFMT.base
|
|
backing file format: IMGFMT
|
|
Format specific information:
|
|
bitmaps:
|
|
[0]:
|
|
flags:
|
|
name: b1
|
|
granularity: 524288
|
|
[1]:
|
|
flags:
|
|
[0]: auto
|
|
name: b2
|
|
granularity: 65536
|
|
[2]:
|
|
flags:
|
|
name: b0
|
|
granularity: 65536
|
|
corrupt: false
|
|
|
|
image: TEST_DIR/t.IMGFMT.base
|
|
file format: IMGFMT
|
|
virtual size: 10 MiB (10485760 bytes)
|
|
cluster_size: 65536
|
|
Format specific information:
|
|
bitmaps:
|
|
[0]:
|
|
flags:
|
|
[0]: auto
|
|
name: b0
|
|
granularity: 65536
|
|
[1]:
|
|
flags:
|
|
[0]: auto
|
|
name: b3
|
|
granularity: 65536
|
|
corrupt: false
|
|
|
|
=== Check bitmap contents ===
|
|
|
|
[{ "start": 0, "length": 3145728, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
|
|
{ "start": 3145728, "length": 1048576, "depth": 0, "zero": false, "data": false},
|
|
{ "start": 4194304, "length": 6291456, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
|
|
[{ "start": 0, "length": 1048576, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
|
|
{ "start": 1048576, "length": 1048576, "depth": 0, "zero": false, "data": false},
|
|
{ "start": 2097152, "length": 8388608, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
|
|
[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
|
|
{ "start": 2097152, "length": 1048576, "depth": 0, "zero": false, "data": false},
|
|
{ "start": 3145728, "length": 7340032, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
|
|
[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
|
|
{ "start": 2097152, "length": 1048576, "depth": 0, "zero": false, "data": false},
|
|
{ "start": 3145728, "length": 7340032, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
|
|
*** done
|