Changeset 22fb7ab in mainline for uspace/lib

Timestamp:

2015-06-26T16:15:31Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

28ed0d9

Parents:

1356f85a

Message:

Delegate disks to volsrv and labels to vbd.

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/vbd.c (added)
• c/generic/vol.c (added)
• c/include/ipc/vbd.h (added)
• c/include/ipc/vol.h (added)
• c/include/types/label.h (added)
• c/include/vbd.h (added)
• c/include/vol.h (added)
• fdisk/include/fdisk.h (modified) (4 diffs)
• fdisk/include/types/fdisk.h (modified) (3 diffs)
• fdisk/src/fdisk.c (modified) (10 diffs)

uspace/lib/c/Makefile

@@ -153 +153 @@
         generic/stats.c \
         generic/assert.c \
-        generic/pio_trace.c
+        generic/pio_trace.c \
+        generic/vbd.c \
+        generic/vol.c
 
 ifeq ($(CONFIG_RTLD),y)

uspace/lib/fdisk/include/fdisk.h

@@ -40 +40 @@
 #include <types/fdisk.h>
 
-extern int fdisk_dev_list_get(fdisk_dev_list_t **);
+extern int fdisk_create(fdisk_t **);
+extern void fdisk_destroy(fdisk_t *);
+extern int fdisk_dev_list_get(fdisk_t *, fdisk_dev_list_t **);
 extern void fdisk_dev_list_free(fdisk_dev_list_t *);
 extern fdisk_dev_info_t *fdisk_dev_first(fdisk_dev_list_t *);
@@ -48 +50 @@
 extern int fdisk_dev_info_capacity(fdisk_dev_info_t *, fdisk_cap_t *);
 
-extern int fdisk_dev_open(service_id_t, fdisk_dev_t **);
+extern int fdisk_dev_open(fdisk_t *, service_id_t, fdisk_dev_t **);
 extern void fdisk_dev_close(fdisk_dev_t *);
 extern int fdisk_dev_get_svcname(fdisk_dev_t *, char **);
@@ -54 +56 @@
 
 extern int fdisk_label_get_info(fdisk_dev_t *, fdisk_label_info_t *);
-extern int fdisk_label_create(fdisk_dev_t *, fdisk_label_type_t);
+extern int fdisk_label_create(fdisk_dev_t *, label_type_t);
 extern int fdisk_label_destroy(fdisk_dev_t *);
 
@@ -68 +70 @@
 extern int fdisk_cap_format(fdisk_cap_t *, char **);
 extern int fdisk_cap_parse(const char *, fdisk_cap_t *);
-extern int fdisk_ltype_format(fdisk_label_type_t, char **);
+extern int fdisk_ltype_format(label_type_t, char **);
 extern int fdisk_fstype_format(fdisk_fstype_t, char **);
 

uspace/lib/fdisk/include/types/fdisk.h

@@ -40 +40 @@
 #include <loc.h>
 #include <stdint.h>
+#include <types/label.h>
+#include <vol.h>
 
 typedef enum {
@@ -95 +97 @@
 } fdisk_dev_info_t;
 
-/** Fdisk label type */
-typedef enum {
-        /** None */
-        fdl_none = 0,
-        /** Unknown */
-        fdl_unknown,
-        /** BIOS Master Boot Record */
-        fdl_mbr,
-        /** UEFI GUID Partition Table */
-        fdl_gpt
-} fdisk_label_type_t;
-
-/** Highest label type + 1 */
-#define FDL_LIMIT (fdl_gpt + 1)
-/** Lowest label type allowed for creation */
-#define FDL_CREATE_LO fdl_mbr
-/** Highest label type allowed for creation + 1 */
-#define FDL_CREATE_HI (fdl_gpt + 1)
-
 /** Open fdisk device */
 typedef struct {
-        /** Label type */
-        fdisk_label_type_t ltype;
+        /** Fdisk instance */
+        struct fdisk *fdisk;
+        /** Disk contents */
+        label_disk_cnt_t dcnt;
+        /** Service ID */
+        service_id_t sid;
         /** Partitions */
         list_t parts; /* of fdisk_part_t */
-        /** Service ID */
-        service_id_t sid;
 } fdisk_dev_t;
 
 typedef struct {
+        /** Disk contents */
+        label_disk_cnt_t dcnt;
         /** Label type */
-        fdisk_label_type_t ltype;
+        label_type_t ltype;
 } fdisk_label_info_t;
 
@@ -156 +143 @@
 } fdisk_part_info_t;
 
+/** Fdisk instance */
+typedef struct fdisk {
+        /** Volume service */
+        vol_t *vol;
+} fdisk_t;
+
 #endif
 

uspace/lib/fdisk/src/fdisk.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
+#include <vol.h>
 
 static const char *cu_str[] = {
@@ -68 +69 @@
 }
 
-int fdisk_dev_list_get(fdisk_dev_list_t **rdevlist)
+int fdisk_create(fdisk_t **rfdisk)
+{
+        fdisk_t *fdisk;
+        int rc;
+
+        fdisk = calloc(1, sizeof(fdisk_t));
+        if (fdisk == NULL)
+                return ENOMEM;
+
+        rc = vol_create(&fdisk->vol);
+        if (rc != EOK) {
+                free(fdisk);
+                return EIO;
+        }
+
+        *rfdisk = fdisk;
+        return EOK;
+}
+
+void fdisk_destroy(fdisk_t *fdisk)
+{
+        vol_destroy(fdisk->vol);
+        free(fdisk);
+}
+
+int fdisk_dev_list_get(fdisk_t *fdisk, fdisk_dev_list_t **rdevlist)
 {
         fdisk_dev_list_t *devlist = NULL;
         fdisk_dev_info_t *info;
-        category_id_t disk_cat;
         service_id_t *svcs = NULL;
         size_t count, i;
@@ -83 +108 @@
         list_initialize(&devlist->devinfos);
 
-        rc = loc_category_get_id("disk", &disk_cat, 0);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
-
-        rc = loc_category_get_svcs(disk_cat, &svcs, &count);
+        rc = vol_get_disks(fdisk->vol, &svcs, &count);
         if (rc != EOK) {
                 rc = EIO;
@@ -210 +229 @@
 }
 
-int fdisk_dev_open(service_id_t sid, fdisk_dev_t **rdev)
+int fdisk_dev_open(fdisk_t *fdisk, service_id_t sid, fdisk_dev_t **rdev)
 {
         fdisk_dev_t *dev;
@@ -218 +237 @@
                 return ENOMEM;
 
-        dev->ltype = fdl_none;
+        dev->fdisk = fdisk;
         dev->sid = sid;
         list_initialize(&dev->parts);
@@ -271 +290 @@
 int fdisk_label_get_info(fdisk_dev_t *dev, fdisk_label_info_t *info)
 {
-        info->ltype = dev->ltype;
-        return EOK;
-}
-
-int fdisk_label_create(fdisk_dev_t *dev, fdisk_label_type_t ltype)
-{
-        if (dev->ltype != fdl_none)
-                return EEXISTS;
-
-        dev->ltype = ltype;
-        return EOK;
+        vol_disk_info_t vinfo;
+        int rc;
+
+        rc = vol_disk_info(dev->fdisk->vol, dev->sid, &vinfo);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
+        info->dcnt = vinfo.dcnt;
+        info->ltype = vinfo.ltype;
+        return EOK;
+error:
+        return rc;
+}
+
+int fdisk_label_create(fdisk_dev_t *dev, label_type_t ltype)
+{
+        return vol_label_create(dev->fdisk->vol, dev->sid, ltype);
 }
 
@@ -287 +314 @@
 {
         fdisk_part_t *part;
-
-        if (dev->ltype == fdl_none)
-                return ENOENT;
+        int rc;
 
         part = fdisk_part_first(dev);
@@ -297 +322 @@
         }
 
-        dev->ltype = fdl_none;
+        rc = vol_disk_empty(dev->fdisk->vol, dev->sid);
+        if (rc != EOK)
+                return EIO;
+
+        dev->dcnt = dc_empty;
         return EOK;
 }
@@ -419 +448 @@
 }
 
-int fdisk_ltype_format(fdisk_label_type_t ltype, char **rstr)
+int fdisk_ltype_format(label_type_t ltype, char **rstr)
 {
         const char *sltype;
@@ -426 +455 @@
         sltype = NULL;
         switch (ltype) {
-        case fdl_none:
-                sltype = "None";
-                break;
-        case fdl_unknown:
-                sltype = "Unknown";
-                break;
-        case fdl_mbr:
+        case lt_mbr:
                 sltype = "MBR";
                 break;
-        case fdl_gpt:
+        case lt_gpt:
                 sltype = "GPT";
                 break;