diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-05-07 16:56:10 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-07-03 16:31:28 -0500 |
| commit | 41819e90af4228c40a92da828a82446073412a5a (patch) | |
| tree | 850a7885f042b221c4a276832a4e19133eae0764 | |
| parent | 97a0e27e719ad2d01420969adebb52f337fa6b94 (diff) | |
qcow1: Make padding in the header explicit
We were relying on all compilers inserting the same padding in the
header struct that is used for the on-disk format. Let's not do that.
Mark the struct as packed and insert an explicit padding field for
compatibility.
Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
(cherry picked from commit ea54feff58efedc809641474b25a3130309678e7)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | block/qcow.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/qcow.c b/block/qcow.c index c470e05f60..1ca04e6f32 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -48,9 +48,10 @@ typedef struct QCowHeader { uint64_t size; /* in bytes */ uint8_t cluster_bits; uint8_t l2_bits; + uint16_t padding; uint32_t crypt_method; uint64_t l1_table_offset; -} QCowHeader; +} QEMU_PACKED QCowHeader; #define L2_CACHE_SIZE 16 |