diff mbox series

[v4,11/12] qcow2: QcowHeaderExtension print names for extension magics

Message ID 20200604174135.11042-12-vsementsov@virtuozzo.com (mailing list archive)
State New, archived
Headers show
Series iotests: Dump QCOW2 dirty bitmaps metadata | expand

Commit Message

Vladimir Sementsov-Ogievskiy June 4, 2020, 5:41 p.m. UTC 
Suggested-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 tests/qemu-iotests/031.out         | 22 +++++++++++-----------
 tests/qemu-iotests/036.out         |  4 ++--
 tests/qemu-iotests/061.out         | 14 +++++++-------
 tests/qemu-iotests/qcow2_format.py | 17 ++++++++++++++++-
 4 files changed, 36 insertions(+), 21 deletions(-)

Comments

Andrey Shinkevich June 5, 2020, 3:42 p.m. UTC | #1 
s/0xE2792ACA/0xe2792aca/
(as suggested by Eric)

Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Vladimir Sementsov-Ogievskiy June 5, 2020, 4:26 p.m. UTC | #2 
04.06.2020 20:41, Vladimir Sementsov-Ogievskiy wrote:
> Suggested-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>   tests/qemu-iotests/031.out         | 22 +++++++++++-----------
>   tests/qemu-iotests/036.out         |  4 ++--
>   tests/qemu-iotests/061.out         | 14 +++++++-------
>   tests/qemu-iotests/qcow2_format.py | 17 ++++++++++++++++-
>   4 files changed, 36 insertions(+), 21 deletions(-)
> 
> diff --git a/tests/qemu-iotests/031.out b/tests/qemu-iotests/031.out
> index 5a4beda6a2..e0225f4247 100644
> --- a/tests/qemu-iotests/031.out
> +++ b/tests/qemu-iotests/031.out
> @@ -25,7 +25,7 @@ refcount_order            4
>   header_length             72
>   
>   Header extension:
> -magic                     0x12345678
> +magic                     305419896 (<unknown>)

Oops, I've broken hex number. I think it should be kept hex, even with name.

>   length                    31
>   data                      'This is a test header extension'
>   
> @@ -53,7 +53,7 @@ refcount_order            4
>   header_length             72
>   
>   Header extension:
> -magic                     0x12345678
> +magic                     305419896 (<unknown>)
>   length                    31
>   data                      'This is a test header extension'
>   
> @@ -81,12 +81,12 @@ refcount_order            4
>   header_length             72
>   
>   Header extension:
> -magic                     0xe2792aca
> +magic                     3799591626 (Backing format)
>   length                    11
>   data                      'host_device'
>   
>   Header extension:
> -magic                     0x12345678
> +magic                     305419896 (<unknown>)
>   length                    31
>   data                      'This is a test header extension'
>   
> @@ -116,12 +116,12 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
>   Header extension:
> -magic                     0x12345678
> +magic                     305419896 (<unknown>)
>   length                    31
>   data                      'This is a test header extension'
>   
> @@ -149,12 +149,12 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
>   Header extension:
> -magic                     0x12345678
> +magic                     305419896 (<unknown>)
>   length                    31
>   data                      'This is a test header extension'
>   
> @@ -182,17 +182,17 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0xe2792aca
> +magic                     3799591626 (Backing format)
>   length                    11
>   data                      'host_device'
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
>   Header extension:
> -magic                     0x12345678
> +magic                     305419896 (<unknown>)
>   length                    31
>   data                      'This is a test header extension'
>   
> diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
> index e409acf60e..6cf892123a 100644
> --- a/tests/qemu-iotests/036.out
> +++ b/tests/qemu-iotests/036.out
> @@ -25,7 +25,7 @@ incompatible_features     []
>   compatible_features       []
>   autoclear_features        [63]
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> @@ -37,7 +37,7 @@ incompatible_features     []
>   compatible_features       []
>   autoclear_features        []
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
> index a51ad1b5ba..7afd2be9d9 100644
> --- a/tests/qemu-iotests/061.out
> +++ b/tests/qemu-iotests/061.out
> @@ -25,7 +25,7 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> @@ -83,7 +83,7 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> @@ -139,7 +139,7 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> @@ -194,7 +194,7 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> @@ -263,7 +263,7 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> @@ -325,7 +325,7 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> @@ -354,7 +354,7 @@ refcount_order            4
>   header_length             112
>   
>   Header extension:
> -magic                     0x6803f857
> +magic                     1745090647 (Feature table)
>   length                    336
>   data                      <binary>
>   
> diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
> index 4683b1e436..caa190f7b1 100644
> --- a/tests/qemu-iotests/qcow2_format.py
> +++ b/tests/qemu-iotests/qcow2_format.py
> @@ -21,6 +21,12 @@ class Flags64(Qcow2Field):
>           return str(bits)
>   
>   
> +class Enum(Qcow2Field):
> +
> +    def __str__(self):
> +        return f'{self.value} ({self.mapping.get(self.value, "<unknown>")})'
> +
> +
>   class Qcow2StructMeta(type):
>   
>       # Mapping from c types to python struct format
> @@ -75,8 +81,17 @@ class Qcow2Struct(metaclass=Qcow2StructMeta):
>   
>   class QcowHeaderExtension(Qcow2Struct):
>   
> +    class Magic(Enum):
> +        mapping = {
> +            0xE2792ACA: 'Backing format',
> +            0x6803f857: 'Feature table',
> +            0x0537be77: 'Crypto header',
> +            0x23852875: 'Bitmaps',
> +            0x44415441: 'Data file'
> +        }
> +
>       fields = (
> -        ('u32', '{:#x}', 'magic'),
> +        ('u32', Magic, 'magic'),
>           ('u32', '{}', 'length')
>           # length bytes of data follows
>           # then padding to next multiply of 8
>
Andrey Shinkevich June 5, 2020, 4:41 p.m. UTC | #3 
Yes, but hex(int) returns str.

Andrey
diff mbox series

Patch

diff --git a/tests/qemu-iotests/031.out b/tests/qemu-iotests/031.out
index 5a4beda6a2..e0225f4247 100644
--- a/tests/qemu-iotests/031.out
+++ b/tests/qemu-iotests/031.out
@@ -25,7 +25,7 @@  refcount_order            4
 header_length             72
 
 Header extension:
-magic                     0x12345678
+magic                     305419896 (<unknown>)
 length                    31
 data                      'This is a test header extension'
 
@@ -53,7 +53,7 @@  refcount_order            4
 header_length             72
 
 Header extension:
-magic                     0x12345678
+magic                     305419896 (<unknown>)
 length                    31
 data                      'This is a test header extension'
 
@@ -81,12 +81,12 @@  refcount_order            4
 header_length             72
 
 Header extension:
-magic                     0xe2792aca
+magic                     3799591626 (Backing format)
 length                    11
 data                      'host_device'
 
 Header extension:
-magic                     0x12345678
+magic                     305419896 (<unknown>)
 length                    31
 data                      'This is a test header extension'
 
@@ -116,12 +116,12 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
 Header extension:
-magic                     0x12345678
+magic                     305419896 (<unknown>)
 length                    31
 data                      'This is a test header extension'
 
@@ -149,12 +149,12 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
 Header extension:
-magic                     0x12345678
+magic                     305419896 (<unknown>)
 length                    31
 data                      'This is a test header extension'
 
@@ -182,17 +182,17 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0xe2792aca
+magic                     3799591626 (Backing format)
 length                    11
 data                      'host_device'
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
 Header extension:
-magic                     0x12345678
+magic                     305419896 (<unknown>)
 length                    31
 data                      'This is a test header extension'
 
diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
index e409acf60e..6cf892123a 100644
--- a/tests/qemu-iotests/036.out
+++ b/tests/qemu-iotests/036.out
@@ -25,7 +25,7 @@  incompatible_features     []
 compatible_features       []
 autoclear_features        [63]
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
@@ -37,7 +37,7 @@  incompatible_features     []
 compatible_features       []
 autoclear_features        []
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
index a51ad1b5ba..7afd2be9d9 100644
--- a/tests/qemu-iotests/061.out
+++ b/tests/qemu-iotests/061.out
@@ -25,7 +25,7 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
@@ -83,7 +83,7 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
@@ -139,7 +139,7 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
@@ -194,7 +194,7 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
@@ -263,7 +263,7 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
@@ -325,7 +325,7 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
@@ -354,7 +354,7 @@  refcount_order            4
 header_length             112
 
 Header extension:
-magic                     0x6803f857
+magic                     1745090647 (Feature table)
 length                    336
 data                      <binary>
 
diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
index 4683b1e436..caa190f7b1 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -21,6 +21,12 @@  class Flags64(Qcow2Field):
         return str(bits)
 
 
+class Enum(Qcow2Field):
+
+    def __str__(self):
+        return f'{self.value} ({self.mapping.get(self.value, "<unknown>")})'
+
+
 class Qcow2StructMeta(type):
 
     # Mapping from c types to python struct format
@@ -75,8 +81,17 @@  class Qcow2Struct(metaclass=Qcow2StructMeta):
 
 class QcowHeaderExtension(Qcow2Struct):
 
+    class Magic(Enum):
+        mapping = {
+            0xE2792ACA: 'Backing format',
+            0x6803f857: 'Feature table',
+            0x0537be77: 'Crypto header',
+            0x23852875: 'Bitmaps',
+            0x44415441: 'Data file'
+        }
+
     fields = (
-        ('u32', '{:#x}', 'magic'),
+        ('u32', Magic, 'magic'),
         ('u32', '{}', 'length')
         # length bytes of data follows
         # then padding to next multiply of 8