diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-05-07 16:56:10 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-05-19 11:36:49 +0200 |
| commit | ea54feff58efedc809641474b25a3130309678e7 (patch) | |
| tree | 637ecb7e2b1379f5d1073675b271d19efdd382bc | |
| parent | 0a86cb731758a7167374ca68735125ce81211002 (diff) | |
| download | focaccia-qemu-ea54feff58efedc809641474b25a3130309678e7.tar.gz focaccia-qemu-ea54feff58efedc809641474b25a3130309678e7.zip | |
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>
| -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 937dd6dd1c..3684794dee 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 |