Changeset f57ccb5 in mainline for uspace/lib/label/src/gpt.c

Timestamp:

2015-08-11T16:03:59Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0bde8523

Parents:

1b23e33

Message:

Set partition type based on selected filesystem type.

File:

• uspace/lib/label/src/gpt.c (modified) (7 diffs)

uspace/lib/label/src/gpt.c

@@ -55 +55 @@
 static int gpt_part_create(label_t *, label_part_spec_t *, label_part_t **);
 static int gpt_part_destroy(label_part_t *);
+static int gpt_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
 
 static void gpt_unused_pte(gpt_entry_t *);
@@ -80 +81 @@
         .part_get_info = gpt_part_get_info,
         .part_create = gpt_part_create,
-        .part_destroy = gpt_part_destroy
+        .part_destroy = gpt_part_destroy,
+        .suggest_ptype = gpt_suggest_ptype
 };
 
@@ -547 +549 @@
         linfo->dcnt = dc_label;
         linfo->ltype = lt_gpt;
-        linfo->flags = 0;
+        linfo->flags = lf_ptype_uuid; /* Partition type is in UUID format */
         if (gpt_can_create_pri(label))
                 linfo->flags = linfo->flags | lf_can_create_pri;
@@ -607 +609 @@
         /* GPT only has primary partitions */
         if (pspec->pkind != lpk_primary) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        /* Partition type must be in UUID format */
+        if (pspec->ptype.fmt != lptf_uuid) {
                 rc = EINVAL;
                 goto error;
@@ -663 +671 @@
 }
 
+static int gpt_suggest_ptype(label_t *label, label_pcnt_t pcnt,
+    label_ptype_t *ptype)
+{
+        const char *ptid;
+        int rc;
+
+        ptid = NULL;
+
+        switch (pcnt) {
+        case lpc_fat12_16:
+        case lpc_exfat:
+        case lpc_fat32:
+                ptid = GPT_MS_BASIC_DATA;
+                break;
+        case lpc_ext4:
+                ptid = GPT_LINUX_FS_DATA;
+                break;
+        case lpc_minix:
+                ptid = GPT_MINIX_FAKE;
+                break;
+        }
+
+        if (ptid == NULL)
+                return EINVAL;
+
+        ptype->fmt = lptf_uuid;
+        rc = uuid_parse(ptid, &ptype->t.uuid, NULL);
+        assert(rc == EOK);
+
+        return EOK;
+}
+
 static void gpt_unused_pte(gpt_entry_t *pte)
 {
@@ -677 +717 @@
 
         memset(pte, 0, sizeof(gpt_entry_t));
-        pte->part_type[0] = 0x12;
+        uuid_encode(&part->ptype.t.uuid, pte->part_type);
         uuid_encode(&part->part_uuid, pte->part_id);
         pte->start_lba = host2uint64_t_le(part->block0);
@@ -713 +753 @@
         part->block0 = b0;
         part->nblocks = b1 - b0 + 1;
+        part->ptype.fmt = lptf_uuid;
+        uuid_decode(pte->part_type, &part->ptype.t.uuid);
         uuid_decode(pte->part_id, &part->part_uuid);