VMware 4 disk images support

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@927 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 22 insertions, 2 deletions

diff --git a/vmdk.h b/vmdk.h
index a847f8b..dbb352d 100644
--- a/vmdk.h
+++ b/vmdk.h
@@ -32,12 +32,11 @@
 
 struct cowdisk_header
 {
-    char magic[4]; /* COWD */
     uint32_t version;
     uint32_t flags;
     uint32_t disk_sectors;
     uint32_t granularity;
-    uint32_t l1dir_sector;
+    uint32_t l1dir_offset;
     uint32_t l1dir_size;
     uint32_t file_sectors;
     uint32_t cylinders;
@@ -50,3 +49,24 @@ struct cowdisk_header2
    uint32_t parent_ts;
    uint32_t timestamp;
 };
+
+/* based on vdk 3.1 10-11-2003 by Ken Kato */
+
+struct vmdisk_header
+{
+    uint32_t version;
+    uint32_t flags;
+    
+    int64_t capacity;
+    int64_t granularity;
+    int64_t desc_offset;
+    int64_t desc_size;
+    int32_t num_gtes_per_gte;
+    int64_t rgd_offset;
+    int64_t gd_offset;
+    int64_t grain_offset;
+
+    char filler[1];
+
+    char check_bytes[4];
+};