summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2014-11-25 18:12:41 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2015-01-14 17:08:42 -0600
commit75eb0f5dbb3beaa718b2a6b6acd5b3cce565586a (patch)
treedd2c8065064cb52050d8abb7e7b2c4f2a389bfd1
parentb495764ae801daeb4ec690b628301f75838352a1 (diff)
downloadqemu-75eb0f5dbb3beaa718b2a6b6acd5b3cce565586a.tar.gz
qcow2.py: Add required padding for header extensions
The qcow2 specification requires that the header extension data be padded to round up the extension size to the next multiple of 8 bytes. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 1416935562-7760-3-git-send-email-kwolf@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 8884dd1bbc5ce42cd657ffcbef3a477443468974) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> (cherry picked from commit a163ac3f57b5baa117158f7c0488d276ba3377e2) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rwxr-xr-xtests/qemu-iotests/qcow2.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index 2058596964..9cc4cf7d08 100755
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -7,6 +7,10 @@ import string
class QcowHeaderExtension:
def __init__(self, magic, length, data):
+ if length % 8 != 0:
+ padding = 8 - (length % 8)
+ data += "\0" * padding
+
self.magic = magic
self.length = length
self.data = data