On 5/26/20 9:54 AM, Andrey Shinkevich wrote:
Add dirty bitmap information to QCOW2 metadata dump in qcow2.py script.
The sample output:

Header extension (Bitmaps):

This change to the output is independently useful. However, per patchew, it does cause 'make check' to fail:

https://patchew.org/logs/1590504866-679474-1-git-send-email-andrey.shinkev...@virtuozzo.com/testing.docker-quick@centos7/?type=message

...
--- /tmp/qemu-test/src/tests/qemu-iotests/031.out 2020-05-26 14:44:51.000000000 +0000 +++ /tmp/qemu-test/build/tests/qemu-iotests/031.out.bad 2020-05-26 18:07:11.753556518 +0000
@@ -24,7 +24,7 @@
 refcount_order            4
 header_length             72

-Header extension:
+Header extension (Unknown):
...
Failures: 031 036 061

I think it would be wise to split this into two patches, one that makes _just_ the following change:


@@ -143,30 +267,39 @@ class QcowHeader:
              print("%-25s" % f[2], value_str)
          print("")
- def dump_extensions(self):
+    def dump_extensions(self, fd):
          for ex in self.extensions:
+ print("Header extension (%s):" % self.extension_name(ex.magic))
+            print("%-25s %#x" % ("magic", ex.magic))
+            print("%-25s %d" % ("length", ex.length))

and whatever is needed to support that, plus the changes necessary to the iotests output to keep them passing (hopefully, the 3 tests identified by 'make check' covers all of the existing tests already using qcow2.py), then the second patch adding the rest of this that then gives details about the bitmap contents.

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


Reply via email to