3c8b7358d6
qemu_img_log() calls into qemu_img_pipe(), which always removes output for 'create' commands on success anyway. Replace all of these calls to the simpler qemu_img_create(...) which doesn't log, but raises a detailed exception object on failure instead. Blank lines are removed from output files where appropriate. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20220321201618.903471-17-jsnow@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
288 lines
10 KiB
Plaintext
288 lines
10 KiB
Plaintext
== Commit tests ==
|
|
wrote 2097152/2097152 bytes at offset 0
|
|
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
=== Check visible data ===
|
|
read 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
read 1048576/1048576 bytes at offset 1048576
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
=== Checking allocation status ===
|
|
1048576/1048576 bytes allocated at offset 0 bytes
|
|
1048576/1048576 bytes allocated at offset 1 MiB
|
|
|
|
0/1048576 bytes allocated at offset 0 bytes
|
|
0/0 bytes allocated at offset 1 MiB
|
|
|
|
0/1048576 bytes allocated at offset 0 bytes
|
|
0/1048576 bytes allocated at offset 1 MiB
|
|
|
|
=== Checking map ===
|
|
[{ "start": 0, "length": 2097152, "depth": 0, "present": true, "zero": false, "data": true, "offset": 327680}]
|
|
|
|
Offset Length Mapped to File
|
|
0 0x200000 0x50000 TEST_DIR/PID-base
|
|
|
|
[{ "start": 0, "length": 1048576, "depth": 1, "present": true, "zero": false, "data": true, "offset": 327680}]
|
|
|
|
Offset Length Mapped to File
|
|
0 0x100000 0x50000 TEST_DIR/PID-base
|
|
|
|
[{ "start": 0, "length": 1048576, "depth": 2, "present": true, "zero": false, "data": true, "offset": 327680},
|
|
{ "start": 1048576, "length": 1048576, "depth": 0, "present": false, "zero": true, "data": false}]
|
|
|
|
Offset Length Mapped to File
|
|
0 0x100000 0x50000 TEST_DIR/PID-base
|
|
|
|
=== Testing qemu-img commit (top -> mid) ===
|
|
Image committed.
|
|
|
|
image: TEST_IMG
|
|
file format: IMGFMT
|
|
virtual size: 2 MiB (2097152 bytes)
|
|
cluster_size: 65536
|
|
backing file: TEST_DIR/PID-base
|
|
backing file format: IMGFMT
|
|
Format specific information:
|
|
compat: 1.1
|
|
compression type: COMPRESSION_TYPE
|
|
lazy refcounts: false
|
|
refcount bits: 16
|
|
corrupt: false
|
|
extended l2: false
|
|
|
|
read 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
read 1048576/1048576 bytes at offset 1048576
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
=== Testing HMP commit (top -> mid) ===
|
|
wrote 2097152/2097152 bytes at offset 0
|
|
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
{"execute": "human-monitor-command", "arguments": {"command-line": "commit drive0"}}
|
|
{"return": ""}
|
|
image: TEST_IMG
|
|
file format: IMGFMT
|
|
virtual size: 2 MiB (2097152 bytes)
|
|
cluster_size: 65536
|
|
backing file: TEST_DIR/PID-base
|
|
backing file format: IMGFMT
|
|
Format specific information:
|
|
compat: 1.1
|
|
compression type: COMPRESSION_TYPE
|
|
lazy refcounts: false
|
|
refcount bits: 16
|
|
corrupt: false
|
|
extended l2: false
|
|
|
|
read 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
read 1048576/1048576 bytes at offset 1048576
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
=== Testing QMP active commit (top -> mid) ===
|
|
wrote 2097152/2097152 bytes at offset 0
|
|
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
{"execute": "block-commit", "arguments": {"auto-dismiss": false, "base-node": "mid", "device": "top", "job-id": "job0"}}
|
|
{"return": {}}
|
|
{"execute": "job-complete", "arguments": {"id": "job0"}}
|
|
{"return": {}}
|
|
{"data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
{"data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
|
{"return": {}}
|
|
image: TEST_IMG
|
|
file format: IMGFMT
|
|
virtual size: 2 MiB (2097152 bytes)
|
|
cluster_size: 65536
|
|
backing file: TEST_DIR/PID-base
|
|
backing file format: IMGFMT
|
|
Format specific information:
|
|
compat: 1.1
|
|
compression type: COMPRESSION_TYPE
|
|
lazy refcounts: false
|
|
refcount bits: 16
|
|
corrupt: false
|
|
extended l2: false
|
|
|
|
read 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
read 1048576/1048576 bytes at offset 1048576
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
=== Testing qemu-img commit (top -> base) ===
|
|
wrote 2097152/2097152 bytes at offset 0
|
|
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image committed.
|
|
|
|
image: TEST_IMG
|
|
file format: IMGFMT
|
|
virtual size: 2 MiB (2097152 bytes)
|
|
cluster_size: 65536
|
|
Format specific information:
|
|
compat: 1.1
|
|
compression type: COMPRESSION_TYPE
|
|
lazy refcounts: false
|
|
refcount bits: 16
|
|
corrupt: false
|
|
extended l2: false
|
|
|
|
read 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
read 1048576/1048576 bytes at offset 1048576
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
=== Testing QMP active commit (top -> base) ===
|
|
wrote 2097152/2097152 bytes at offset 0
|
|
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
{"execute": "block-commit", "arguments": {"auto-dismiss": false, "base-node": "base", "device": "top", "job-id": "job0"}}
|
|
{"return": {}}
|
|
{"execute": "job-complete", "arguments": {"id": "job0"}}
|
|
{"return": {}}
|
|
{"data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
{"data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
|
{"return": {}}
|
|
image: TEST_IMG
|
|
file format: IMGFMT
|
|
virtual size: 1 MiB (1048576 bytes)
|
|
cluster_size: 65536
|
|
backing file: TEST_DIR/PID-base
|
|
backing file format: IMGFMT
|
|
Format specific information:
|
|
compat: 1.1
|
|
compression type: COMPRESSION_TYPE
|
|
lazy refcounts: false
|
|
refcount bits: 16
|
|
corrupt: false
|
|
extended l2: false
|
|
|
|
read 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
read 1048576/1048576 bytes at offset 1048576
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
== Resize tests ==
|
|
=== preallocation=off ===
|
|
wrote 65536/65536 bytes at offset 5368709120
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image resized.
|
|
|
|
read 65536/65536 bytes at offset 5368709120
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
1 GiB (0x40000000) bytes not allocated at offset 0 bytes (0x0)
|
|
7 GiB (0x1c0000000) bytes allocated at offset 1 GiB (0x40000000)
|
|
|
|
[{ "start": 0, "length": 1073741824, "depth": 1, "present": false, "zero": true, "data": false},
|
|
{ "start": 1073741824, "length": 7516192768, "depth": 0, "present": true, "zero": true, "data": false}]
|
|
|
|
=== preallocation=metadata ===
|
|
wrote 65536/65536 bytes at offset 33285996544
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image resized.
|
|
|
|
read 65536/65536 bytes at offset 33285996544
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
30 GiB (0x780000000) bytes not allocated at offset 0 bytes (0x0)
|
|
3 GiB (0xc0000000) bytes allocated at offset 30 GiB (0x780000000)
|
|
|
|
[{ "start": 0, "length": 32212254720, "depth": 1, "present": false, "zero": true, "data": false},
|
|
{ "start": 32212254720, "length": 536870912, "depth": 0, "present": true, "zero": true, "data": false, "offset": 327680},
|
|
{ "start": 32749125632, "length": 536870912, "depth": 0, "present": true, "zero": true, "data": false, "offset": 537264128},
|
|
{ "start": 33285996544, "length": 536870912, "depth": 0, "present": true, "zero": true, "data": false, "offset": 1074200576},
|
|
{ "start": 33822867456, "length": 536870912, "depth": 0, "present": true, "zero": true, "data": false, "offset": 1611137024},
|
|
{ "start": 34359738368, "length": 536870912, "depth": 0, "present": true, "zero": true, "data": false, "offset": 2148139008},
|
|
{ "start": 34896609280, "length": 536870912, "depth": 0, "present": true, "zero": true, "data": false, "offset": 2685075456}]
|
|
|
|
=== preallocation=falloc ===
|
|
wrote 65536/65536 bytes at offset 9437184
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image resized.
|
|
|
|
read 65536/65536 bytes at offset 9437184
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
5 MiB (0x500000) bytes not allocated at offset 0 bytes (0x0)
|
|
10 MiB (0xa00000) bytes allocated at offset 5 MiB (0x500000)
|
|
|
|
[{ "start": 0, "length": 5242880, "depth": 1, "present": false, "zero": true, "data": false},
|
|
{ "start": 5242880, "length": 10485760, "depth": 0, "present": true, "zero": false, "data": true, "offset": 327680}]
|
|
|
|
=== preallocation=full ===
|
|
wrote 65536/65536 bytes at offset 11534336
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image resized.
|
|
|
|
read 65536/65536 bytes at offset 11534336
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
8 MiB (0x800000) bytes not allocated at offset 0 bytes (0x0)
|
|
4 MiB (0x400000) bytes allocated at offset 8 MiB (0x800000)
|
|
|
|
[{ "start": 0, "length": 8388608, "depth": 1, "present": false, "zero": true, "data": false},
|
|
{ "start": 8388608, "length": 4194304, "depth": 0, "present": true, "zero": false, "data": true, "offset": 327680}]
|
|
|
|
=== preallocation=off ===
|
|
wrote 65536/65536 bytes at offset 259072
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image resized.
|
|
|
|
read 65536/65536 bytes at offset 259072
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
192 KiB (0x30000) bytes not allocated at offset 0 bytes (0x0)
|
|
320 KiB (0x50000) bytes allocated at offset 192 KiB (0x30000)
|
|
|
|
[{ "start": 0, "length": 196608, "depth": 1, "present": false, "zero": true, "data": false},
|
|
{ "start": 196608, "length": 65536, "depth": 0, "present": true, "zero": false, "data": true, "offset": 327680},
|
|
{ "start": 262144, "length": 262144, "depth": 0, "present": true, "zero": true, "data": false}]
|
|
|
|
=== preallocation=off ===
|
|
wrote 65536/65536 bytes at offset 344064
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image resized.
|
|
|
|
read 65536/65536 bytes at offset 344064
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
256 KiB (0x40000) bytes not allocated at offset 0 bytes (0x0)
|
|
256 KiB (0x40000) bytes allocated at offset 256 KiB (0x40000)
|
|
|
|
[{ "start": 0, "length": 262144, "depth": 1, "present": false, "zero": true, "data": false},
|
|
{ "start": 262144, "length": 262144, "depth": 0, "present": true, "zero": true, "data": false}]
|
|
|
|
=== preallocation=off ===
|
|
wrote 65536/65536 bytes at offset 446464
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
Image resized.
|
|
|
|
read 65536/65536 bytes at offset 446464
|
|
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
256 KiB (0x40000) bytes not allocated at offset 0 bytes (0x0)
|
|
244 KiB (0x3d000) bytes allocated at offset 256 KiB (0x40000)
|
|
|
|
[{ "start": 0, "length": 262144, "depth": 1, "present": false, "zero": true, "data": false},
|
|
{ "start": 262144, "length": 249856, "depth": 0, "present": true, "zero": true, "data": false}]
|
|
|