|
 |
9ae3a8 |
From 48eeebecb8133d687cd86f33e1b9cee71baa2d35 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 6 Aug 2013 15:44:47 +0800
|
|
|
9ae3a8 |
Subject: [PATCH 01/13] vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1377573001-27070-2-git-send-email-famz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 53781
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 01/13] vmdk: Make VMDK3Header and
|
|
|
9ae3a8 |
VmdkGrainMarker QEMU_PACKED
|
|
|
9ae3a8 |
Bugzilla: 995866
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
It's best to make it consistent that all on disk structures are
|
|
|
9ae3a8 |
QEMU_PACKED.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 5d8caa543c9714bee36b04899797a3721dff4090)
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/vmdk.c | 4 ++--
|
|
|
9ae3a8 |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
|
9ae3a8 |
index f0c1f93..e85f4ea 100644
|
|
|
9ae3a8 |
--- a/block/vmdk.c
|
|
|
9ae3a8 |
+++ b/block/vmdk.c
|
|
|
9ae3a8 |
@@ -62,7 +62,7 @@ typedef struct {
|
|
|
9ae3a8 |
uint32_t cylinders;
|
|
|
9ae3a8 |
uint32_t heads;
|
|
|
9ae3a8 |
uint32_t sectors_per_track;
|
|
|
9ae3a8 |
-} VMDK3Header;
|
|
|
9ae3a8 |
+} QEMU_PACKED VMDK3Header;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
typedef struct {
|
|
|
9ae3a8 |
uint32_t version;
|
|
|
9ae3a8 |
@@ -131,7 +131,7 @@ typedef struct VmdkGrainMarker {
|
|
|
9ae3a8 |
uint64_t lba;
|
|
|
9ae3a8 |
uint32_t size;
|
|
|
9ae3a8 |
uint8_t data[0];
|
|
|
9ae3a8 |
-} VmdkGrainMarker;
|
|
|
9ae3a8 |
+} QEMU_PACKED VmdkGrainMarker;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
enum {
|
|
|
9ae3a8 |
MARKER_END_OF_STREAM = 0,
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|