From: Fam Zheng <famz@redhat.com>
Date: Tue, 6 Aug 2013 07:44:47 +0000 (+0800)
Subject: vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED
X-Git-Tag: v1.6.0-rc2~10^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d8caa543c9714bee36b04899797a3721dff4090;p=thirdparty%2Fqemu.git

vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED

It's best to make it consistent that all on disk structures are
QEMU_PACKED.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/vmdk.c b/block/vmdk.c
index e6c50b1e359..5c3c24086fd 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -62,7 +62,7 @@ typedef struct {
     uint32_t cylinders;
     uint32_t heads;
     uint32_t sectors_per_track;
-} VMDK3Header;
+} QEMU_PACKED VMDK3Header;
 
 typedef struct {
     uint32_t version;
@@ -131,7 +131,7 @@ typedef struct VmdkGrainMarker {
     uint64_t lba;
     uint32_t size;
     uint8_t  data[0];
-} VmdkGrainMarker;
+} QEMU_PACKED VmdkGrainMarker;
 
 enum {
     MARKER_END_OF_STREAM    = 0,