Changeset 70815a24 in mainline

Timestamp:

2015-07-09T22:00:34Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b7a4d06

Parents:

bf7ddde

Message:

Generate GUIDs for new GPT labels and partitions.

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/uuid.c (added)
• c/include/uuid.h (added)
• label/include/types/liblabel.h (modified) (2 diffs)
• label/src/gpt.c (modified) (7 diffs)

uspace/lib/c/Makefile

@@ -154 +154 @@
         generic/assert.c \
         generic/pio_trace.c \
+        generic/uuid.c \
         generic/vbd.c \
         generic/vol.c

uspace/lib/label/include/types/liblabel.h

@@ -41 +41 @@
 #include <sys/types.h>
 #include <vol.h>
+#include <uuid.h>
 
 typedef struct label label_t;
@@ -96 +97 @@
         /** Partition type */
         uint64_t ptype;
+        /** Partition UUID */
+        uuid_t part_uuid;
 };
 

uspace/lib/label/src/gpt.c

@@ -40 +40 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <uuid.h>
 
 #include "std/gpt.h"
@@ -335 +336 @@
         uint64_t resv_blocks;
         uint32_t pt_crc;
+        uuid_t disk_uuid;
         int i, j;
         int rc;
@@ -399 +401 @@
                         goto error;
                 }
+
+                uuid_generate(&disk_uuid);
 
                 for (j = 0; j < 8; ++j)
@@ -409 +413 @@
                 gpt_hdr->first_usable_lba = host2uint64_t_le(ba_min);
                 gpt_hdr->last_usable_lba = host2uint64_t_le(ba_max);
-                //gpt_hdr->disk_guid XXX
+                uuid_encode(&disk_uuid, gpt_hdr->disk_guid);
                 gpt_hdr->entry_lba = host2uint64_t_le(ptba[i]);
                 gpt_hdr->num_entries = host2uint32_t_le(num_entries);
@@ -594 +598 @@
         part->nblocks = pspec->nblocks;
         part->ptype = pspec->ptype;
+        uuid_generate(&part->part_uuid);
 
         /* Prepare partition table entry */
@@ -651 +656 @@
         memset(pte, 0, sizeof(gpt_entry_t));
         pte->part_type[0] = 0x12;
-        pte->part_id[0] = 0x34;
+        uuid_encode(&part->part_uuid, pte->part_id);
         pte->start_lba = host2uint64_t_le(part->block0);
         pte->end_lba = host2uint64_t_le(eblock);
@@ -686 +691 @@
         part->block0 = b0;
         part->nblocks = b1 - b0 + 1;
+        uuid_decode(pte->part_id, &part->part_uuid);
 
         part->label = label;