Skip to content

Commit

Permalink
qcow2_format.py: use tuples instead of lists for fields
Browse files Browse the repository at this point in the history
No need in lists: it's a constant variable.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-6-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and ebblake committed Jun 9, 2020
1 parent eeafed5 commit b2f1415
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions tests/qemu-iotests/qcow2_format.py
Expand Up @@ -39,29 +39,29 @@ class QcowHeader:
uint32_t = 'I'
uint64_t = 'Q'

fields = [
fields = (
# Version 2 header fields
[uint32_t, '%#x', 'magic'],
[uint32_t, '%d', 'version'],
[uint64_t, '%#x', 'backing_file_offset'],
[uint32_t, '%#x', 'backing_file_size'],
[uint32_t, '%d', 'cluster_bits'],
[uint64_t, '%d', 'size'],
[uint32_t, '%d', 'crypt_method'],
[uint32_t, '%d', 'l1_size'],
[uint64_t, '%#x', 'l1_table_offset'],
[uint64_t, '%#x', 'refcount_table_offset'],
[uint32_t, '%d', 'refcount_table_clusters'],
[uint32_t, '%d', 'nb_snapshots'],
[uint64_t, '%#x', 'snapshot_offset'],
(uint32_t, '%#x', 'magic'),
(uint32_t, '%d', 'version'),
(uint64_t, '%#x', 'backing_file_offset'),
(uint32_t, '%#x', 'backing_file_size'),
(uint32_t, '%d', 'cluster_bits'),
(uint64_t, '%d', 'size'),
(uint32_t, '%d', 'crypt_method'),
(uint32_t, '%d', 'l1_size'),
(uint64_t, '%#x', 'l1_table_offset'),
(uint64_t, '%#x', 'refcount_table_offset'),
(uint32_t, '%d', 'refcount_table_clusters'),
(uint32_t, '%d', 'nb_snapshots'),
(uint64_t, '%#x', 'snapshot_offset'),

# Version 3 header fields
[uint64_t, 'mask', 'incompatible_features'],
[uint64_t, 'mask', 'compatible_features'],
[uint64_t, 'mask', 'autoclear_features'],
[uint32_t, '%d', 'refcount_order'],
[uint32_t, '%d', 'header_length'],
]
(uint64_t, 'mask', 'incompatible_features'),
(uint64_t, 'mask', 'compatible_features'),
(uint64_t, 'mask', 'autoclear_features'),
(uint32_t, '%d', 'refcount_order'),
(uint32_t, '%d', 'header_length'),
)

fmt = '>' + ''.join(field[0] for field in fields)

Expand Down

0 comments on commit b2f1415

Please sign in to comment.