3419ec713f
iotests: Add copyright line in qcow2.py
...
The file qcow2.py was originally contributed in 2012 by Kevin Wolf,
but was not given traditional boilerplate headers at the time. The
missing license was just rectified (commit 16306a7b39d5262c7124kwolf@redhat.com >
CC: Stefan Hajnoczi <stefanha@redhat.com >
CC: Eduardo Habkost <ehabkost@redhat.com >
CC: Max Reitz <mreitz@redhat.com >
CC: Philippe Mathieu-Daudé <philmd@redhat.com >
CC: Paolo Bonzini <pbonzini@redhat.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
Message-Id: <20200609205944.3549240-1-eblake@redhat.com >
Acked-by: Stefan Hajnoczi <stefanha@redhat.com >
Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com >
Signed-off-by: Kevin Wolf <kwolf@redhat.com >
2020-06-17 16:21:21 +02:00
820c6bee53
qcow2_format.py: dump bitmaps header extension
...
Add class for bitmap extension and dump its fields. Further work is to
dump bitmap directory.
Test new functionality inside 291 iotest.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-14-vsementsov@virtuozzo.com >
[eblake: fix iotest output]
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:10 -05:00
aef87784f9
qcow2: QcowHeaderExtension print names for extension magics
...
Suggested-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Message-Id: <20200606081806.23897-13-vsementsov@virtuozzo.com >
Reviewed-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:10 -05:00
a9e750e1ce
qcow2_format: refactor QcowHeaderExtension as a subclass of Qcow2Struct
...
Only two fields we can parse by generic code, but that is better than
nothing. Keep further refactoring of variable-length fields for another
day.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-12-vsementsov@virtuozzo.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
0931fcc7be
qcow2_format.py: QcowHeaderExtension: add dump method
...
Obviously, for-loop body in dump_extensions should be the dump method
of extension.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-11-vsementsov@virtuozzo.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
860543f055
qcow2_format.py: add field-formatting class
...
Allow formatter class in structure definition instead of hacking with
'mask'. This will simplify further introduction of new formatters.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-10-vsementsov@virtuozzo.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
0903e3b371
qcow2_format.py: separate generic functionality of structure classes
...
We are going to introduce more Qcow2 structure types, defined like
QcowHeader. Move generic functionality into base class to be reused for
further structure classes.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-9-vsementsov@virtuozzo.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
5432a0db52
qcow2_format.py: use strings to specify c-type of struct fields
...
We are going to move field-parsing to super-class, this will be simpler
with simple string specifiers instead of variables.
For some reason, python doesn't allow the definition of ctypes variable
in the class alongside fields: it would not be available then for use
by the 'for' operator. Don't worry: ctypes will be moved to metaclass
soon.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-8-vsementsov@virtuozzo.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
621ca4988a
qcow2_format.py: use modern string formatting
...
Use .format and f-strings instead of old %style. Also, the file uses
both '' and "" quotes, for consistency let's use '', except for cases
when we need '' inside the string (use "" to avoid extra escaping).
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-7-vsementsov@virtuozzo.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
b2f1415444
qcow2_format.py: use tuples instead of lists for fields
...
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 >
2020-06-09 15:47:09 -05:00
eeafed5f6e
qcow2_format.py: drop new line printing at end of dump()
...
This will simplify further conversion. To compensate, print this empty
line directly in cmd_dump_header().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com >
Message-Id: <20200606081806.23897-5-vsementsov@virtuozzo.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
d5262c7124
qcow2.py: move qcow2 format classes to separate module
...
We are going to enhance qcow2 format parsing by adding more structure
classes. Let's split format parsing from utility code.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com >
Message-Id: <20200606081806.23897-4-vsementsov@virtuozzo.com >
Reviewed-by: Eric Blake <eblake@redhat.com >
Signed-off-by: Eric Blake <eblake@redhat.com >
2020-06-09 15:47:09 -05:00
