From: Kevin Wolf <kwolf@redhat.com>
Date: Thu, 16 Aug 2012 08:34:10 +0000 (+0200)
Subject: vmdk: Fix header structure
X-Git-Tag: v1.1.2~45
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=07ab4fc1ef2e628209ecab97475ea45071b19ec8;p=users%2Fdwmw2%2Fqemu.git

vmdk: Fix header structure

Commit bb45ded9 swapped gd_offset and rgd_offset. This is wrong.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 7a736bfa4e0a58087054cad68a1d4b3804bbb708)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/block/vmdk.c b/block/vmdk.c
index 18e9b4caf6..28541fe6f6 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -57,8 +57,8 @@ typedef struct {
     int64_t desc_offset;
     int64_t desc_size;
     int32_t num_gtes_per_gte;
-    int64_t gd_offset;
     int64_t rgd_offset;
+    int64_t gd_offset;
     int64_t grain_offset;
     char filler[1];
     char check_bytes[4];