cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-vmdk-Make-VMDK3Header-and-VmdkGrainMarker-QEMU_PACKE.patch

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