From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 7 May 2014 14:56:10 +0000 (+0200)
Subject: qcow1: Make padding in the header explicit
X-Git-Tag: v2.0.1~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d234c8f1f6bb52be075581d8237d4683b942bbe3;p=thirdparty%2Fqemu.git

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>
---

diff --git a/block/qcow.c b/block/qcow.c
index d5a7d5fd1ed..9018f44e64b 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