mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-25 04:30:02 +00:00
572ad9783f
The patch adds some preparation parts for incompatible compression type
feature to qcow2 allowing the use different compression methods for
image clusters (de)compressing.
It is implied that the compression type is set on the image creation and
can be changed only later by image conversion, thus compression type
defines the only compression algorithm used for the image, and thus,
for all image clusters.
The goal of the feature is to add support of other compression methods
to qcow2. For example, ZSTD which is more effective on compression than ZLIB.
The default compression is ZLIB. Images created with ZLIB compression type
are backward compatible with older qemu versions.
Adding of the compression type breaks a number of tests because now the
compression type is reported on image creation and there are some changes
in the qcow2 header in size and offsets.
The tests are fixed in the following ways:
* filter out compression_type for many tests
* fix header size, feature table size and backing file offset
affected tests: 031, 036, 061, 080
header_size +=8: 1 byte compression type
7 bytes padding
feature_table += 48: incompatible feature compression type
backing_file_offset += 56 (8 + 48 -> header_change + feature_table_change)
* add "compression type" for test output matching when it isn't filtered
affected tests: 049, 060, 061, 065, 082, 085, 144, 182, 185, 198, 206,
242, 255, 274, 280
Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
QAPI part:
Acked-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200507082521.29210-2-dplotnikov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
200 lines
5.3 KiB
Plaintext
200 lines
5.3 KiB
Plaintext
QA output created by 031
|
|
|
|
===== Testing with -o compat=0.10 =====
|
|
|
|
=== Create image with unknown header extension ===
|
|
|
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
magic 0x514649fb
|
|
version 2
|
|
backing_file_offset 0x0
|
|
backing_file_size 0x0
|
|
cluster_bits 16
|
|
size 67108864
|
|
crypt_method 0
|
|
l1_size 1
|
|
l1_table_offset 0x30000
|
|
refcount_table_offset 0x10000
|
|
refcount_table_clusters 1
|
|
nb_snapshots 0
|
|
snapshot_offset 0x0
|
|
incompatible_features []
|
|
compatible_features []
|
|
autoclear_features []
|
|
refcount_order 4
|
|
header_length 72
|
|
|
|
Header extension:
|
|
magic 0x12345678
|
|
length 31
|
|
data 'This is a test header extension'
|
|
|
|
No errors were found on the image.
|
|
|
|
=== Rewrite header with no backing file ===
|
|
|
|
magic 0x514649fb
|
|
version 2
|
|
backing_file_offset 0x0
|
|
backing_file_size 0x0
|
|
cluster_bits 16
|
|
size 67108864
|
|
crypt_method 0
|
|
l1_size 1
|
|
l1_table_offset 0x30000
|
|
refcount_table_offset 0x10000
|
|
refcount_table_clusters 1
|
|
nb_snapshots 0
|
|
snapshot_offset 0x0
|
|
incompatible_features []
|
|
compatible_features []
|
|
autoclear_features []
|
|
refcount_order 4
|
|
header_length 72
|
|
|
|
Header extension:
|
|
magic 0x12345678
|
|
length 31
|
|
data 'This is a test header extension'
|
|
|
|
No errors were found on the image.
|
|
|
|
=== Add a backing file and format ===
|
|
|
|
magic 0x514649fb
|
|
version 2
|
|
backing_file_offset 0x90
|
|
backing_file_size 0x17
|
|
cluster_bits 16
|
|
size 67108864
|
|
crypt_method 0
|
|
l1_size 1
|
|
l1_table_offset 0x30000
|
|
refcount_table_offset 0x10000
|
|
refcount_table_clusters 1
|
|
nb_snapshots 0
|
|
snapshot_offset 0x0
|
|
incompatible_features []
|
|
compatible_features []
|
|
autoclear_features []
|
|
refcount_order 4
|
|
header_length 72
|
|
|
|
Header extension:
|
|
magic 0xe2792aca
|
|
length 11
|
|
data 'host_device'
|
|
|
|
Header extension:
|
|
magic 0x12345678
|
|
length 31
|
|
data 'This is a test header extension'
|
|
|
|
|
|
===== Testing with -o compat=1.1 =====
|
|
|
|
=== Create image with unknown header extension ===
|
|
|
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
magic 0x514649fb
|
|
version 3
|
|
backing_file_offset 0x0
|
|
backing_file_size 0x0
|
|
cluster_bits 16
|
|
size 67108864
|
|
crypt_method 0
|
|
l1_size 1
|
|
l1_table_offset 0x30000
|
|
refcount_table_offset 0x10000
|
|
refcount_table_clusters 1
|
|
nb_snapshots 0
|
|
snapshot_offset 0x0
|
|
incompatible_features []
|
|
compatible_features []
|
|
autoclear_features []
|
|
refcount_order 4
|
|
header_length 112
|
|
|
|
Header extension:
|
|
magic 0x6803f857
|
|
length 336
|
|
data <binary>
|
|
|
|
Header extension:
|
|
magic 0x12345678
|
|
length 31
|
|
data 'This is a test header extension'
|
|
|
|
No errors were found on the image.
|
|
|
|
=== Rewrite header with no backing file ===
|
|
|
|
magic 0x514649fb
|
|
version 3
|
|
backing_file_offset 0x0
|
|
backing_file_size 0x0
|
|
cluster_bits 16
|
|
size 67108864
|
|
crypt_method 0
|
|
l1_size 1
|
|
l1_table_offset 0x30000
|
|
refcount_table_offset 0x10000
|
|
refcount_table_clusters 1
|
|
nb_snapshots 0
|
|
snapshot_offset 0x0
|
|
incompatible_features []
|
|
compatible_features []
|
|
autoclear_features []
|
|
refcount_order 4
|
|
header_length 112
|
|
|
|
Header extension:
|
|
magic 0x6803f857
|
|
length 336
|
|
data <binary>
|
|
|
|
Header extension:
|
|
magic 0x12345678
|
|
length 31
|
|
data 'This is a test header extension'
|
|
|
|
No errors were found on the image.
|
|
|
|
=== Add a backing file and format ===
|
|
|
|
magic 0x514649fb
|
|
version 3
|
|
backing_file_offset 0x210
|
|
backing_file_size 0x17
|
|
cluster_bits 16
|
|
size 67108864
|
|
crypt_method 0
|
|
l1_size 1
|
|
l1_table_offset 0x30000
|
|
refcount_table_offset 0x10000
|
|
refcount_table_clusters 1
|
|
nb_snapshots 0
|
|
snapshot_offset 0x0
|
|
incompatible_features []
|
|
compatible_features []
|
|
autoclear_features []
|
|
refcount_order 4
|
|
header_length 112
|
|
|
|
Header extension:
|
|
magic 0xe2792aca
|
|
length 11
|
|
data 'host_device'
|
|
|
|
Header extension:
|
|
magic 0x6803f857
|
|
length 336
|
|
data <binary>
|
|
|
|
Header extension:
|
|
magic 0x12345678
|
|
length 31
|
|
data 'This is a test header extension'
|
|
|
|
*** done
|