mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcow1: Make padding in the header explicit

Browse Source 
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>
This commit is contained in:
Kevin Wolf 2014-05-07 16:56:10 +02:00
parent 0a86cb7317
commit ea54feff58
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/qcow.c
View File

@ -48,9 +48,10 @@ typedef struct QCowHeader {
uint64_t size; /* in bytes */ uint64_t size; /* in bytes */
uint8_t cluster_bits; uint8_t cluster_bits;
uint8_t l2_bits; uint8_t l2_bits;
uint16_t padding;
uint32_t crypt_method; uint32_t crypt_method;
uint64_t l1_table_offset; uint64_t l1_table_offset;
} QCowHeader; } QEMU_PACKED QCowHeader;
#define L2_CACHE_SIZE 16 #define L2_CACHE_SIZE 16