[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/15] qcow2_format.py: use tuples instead of lists for fields
From: |
Eric Blake |
Subject: |
[PULL 06/15] qcow2_format.py: use tuples instead of lists for fields |
Date: |
Tue, 9 Jun 2020 15:52:36 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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>
---
tests/qemu-iotests/qcow2_format.py | 40 +++++++++++++++---------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/tests/qemu-iotests/qcow2_format.py
b/tests/qemu-iotests/qcow2_format.py
index 2b6c9612ae01..e2f08ed69194 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -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)
--
2.27.0
- [PULL 01/15] qemu-img: Fix doc typo for 'bitmap' subcommand, (continued)
- [PULL 01/15] qemu-img: Fix doc typo for 'bitmap' subcommand, Eric Blake, 2020/06/09
- [PULL 05/15] qcow2_format.py: drop new line printing at end of dump(), Eric Blake, 2020/06/09
- [PULL 03/15] qcow2.py: add licensing blurb, Eric Blake, 2020/06/09
- [PULL 04/15] qcow2.py: move qcow2 format classes to separate module, Eric Blake, 2020/06/09
- [PULL 10/15] qcow2_format.py: add field-formatting class, Eric Blake, 2020/06/09
- [PULL 07/15] qcow2_format.py: use modern string formatting, Eric Blake, 2020/06/09
- [PULL 09/15] qcow2_format.py: separate generic functionality of structure classes, Eric Blake, 2020/06/09
- [PULL 02/15] qcow2.py: python style fixes, Eric Blake, 2020/06/09
- [PULL 12/15] qcow2_format: refactor QcowHeaderExtension as a subclass of Qcow2Struct, Eric Blake, 2020/06/09
- [PULL 15/15] iotests: Fix 291 across more file systems, Eric Blake, 2020/06/09
- [PULL 06/15] qcow2_format.py: use tuples instead of lists for fields,
Eric Blake <=
- [PULL 08/15] qcow2_format.py: use strings to specify c-type of struct fields, Eric Blake, 2020/06/09
- [PULL 11/15] qcow2_format.py: QcowHeaderExtension: add dump method, Eric Blake, 2020/06/09
- [PULL 14/15] qcow2_format.py: dump bitmaps header extension, Eric Blake, 2020/06/09
- [PULL 13/15] qcow2: QcowHeaderExtension print names for extension magics, Eric Blake, 2020/06/09
- Re: [PULL 00/15] bitmaps patches for 2020-06-09, Peter Maydell, 2020/06/11