Changeset 28ed0d95 in mainline for uspace/lib

Timestamp:

2015-06-27T19:50:12Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

78d50bd

Parents:

22fb7ab

Message:

VBD client API, liblabel API, pass partition creation/deletion through to VBD.

Location:

uspace/lib

Files:

• c/generic/vbd.c (modified) (2 diffs)
• c/include/ipc/vbd.h (modified) (1 diff)
• c/include/vbd.h (modified) (2 diffs)
• fdisk/include/types/fdisk.h (modified) (3 diffs)
• fdisk/src/fdisk.c (modified) (5 diffs)
• label/include/label.h (added)
• label/include/types/liblabel.h (added)
• label/src/label.c (modified) (1 diff)

uspace/lib/c/generic/vbd.c

@@ -37 +37 @@
 #include <ipc/vbd.h>
 #include <loc.h>
+#include <mem.h>
 #include <stdlib.h>
 #include <types/label.h>
@@ -153 +154 @@
 }
 
+/** Get list of IDs into a buffer of fixed size.
+ *
+ * @param vbd      Virtual Block Device
+ * @param method   IPC method
+ * @param arg1     First argument
+ * @param id_buf   Buffer to store IDs
+ * @param buf_size Buffer size
+ * @param act_size Place to store actual size of complete data.
+ *
+ * @return EOK on success or negative error code.
+ */
+static int vbd_get_ids_once(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
+    sysarg_t *id_buf, size_t buf_size, size_t *act_size)
+{
+        async_exch_t *exch = async_exchange_begin(vbd->sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, method, arg1, &answer);
+        int rc = async_data_read_start(exch, id_buf, buf_size);
+
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+
+        if (retval != EOK) {
+                return retval;
+        }
+
+        *act_size = IPC_GET_ARG1(answer);
+        return EOK;
+}
+
+/** Get list of IDs.
+ *
+ * Returns an allocated array of service IDs.
+ *
+ * @param vbd    Virtual Block Device
+ * @param method IPC method
+ * @param arg1   IPC argument 1
+ * @param data   Place to store pointer to array of IDs
+ * @param count  Place to store number of IDs
+ * @return       EOK on success or negative error code
+ */
+static int vbd_get_ids_internal(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
+    sysarg_t **data, size_t *count)
+{
+        *data = NULL;
+        *count = 0;
+
+        size_t act_size = 0;
+        int rc = vbd_get_ids_once(vbd, method, arg1, NULL, 0, &act_size);
+        if (rc != EOK)
+                return rc;
+
+        size_t alloc_size = act_size;
+        service_id_t *ids = malloc(alloc_size);
+        if (ids == NULL)
+                return ENOMEM;
+
+        while (true) {
+                rc = vbd_get_ids_once(vbd, method, arg1, ids, alloc_size,
+                    &act_size);
+                if (rc != EOK)
+                        return rc;
+
+                if (act_size <= alloc_size)
+                        break;
+
+                alloc_size = act_size;
+                ids = realloc(ids, alloc_size);
+                if (ids == NULL)
+                        return ENOMEM;
+        }
+
+        *count = act_size / sizeof(service_id_t);
+        *data = ids;
+        return EOK;
+}
+
+/** Get list of disks as array of service IDs.
+ *
+ * @param vbd   Virtual Block Device
+ * @param data  Place to store pointer to array
+ * @param count Place to store length of array (number of entries)
+ *
+ * @return EOK on success or negative error code
+ */
+int vbd_label_get_parts(vbd_t *vbd, service_id_t disk,
+    service_id_t **data, size_t *count)
+{
+        return vbd_get_ids_internal(vbd, VBD_LABEL_GET_PARTS, disk,
+            data, count);
+}
+
+int vbd_part_get_info(vbd_t *vbd, vbd_part_id_t part, vbd_part_info_t *pinfo)
+{
+        async_exch_t *exch;
+        int retval;
+
+        exch = async_exchange_begin(vbd->sess);
+        retval = async_req_1_0(exch, VBD_PART_GET_INFO, part);
+        async_exchange_end(exch);
+
+        if (retval != EOK)
+                return EIO;
+
+        return EOK;
+}
+
+int vbd_part_create(vbd_t *vbd, service_id_t disk, vbd_part_spec_t *pspec,
+    vbd_part_id_t *rpart)
+{
+        async_exch_t *exch;
+        sysarg_t part;
+        int retval;
+
+        exch = async_exchange_begin(vbd->sess);
+        retval = async_req_1_1(exch, VBD_PART_CREATE, disk, &part);
+        async_exchange_end(exch);
+
+        if (retval != EOK)
+                return EIO;
+
+        *rpart = (vbd_part_id_t)part;
+        return EOK;
+}
+
+int vbd_part_delete(vbd_t *vbd, vbd_part_id_t part)
+{
+        async_exch_t *exch;
+        int retval;
+
+        exch = async_exchange_begin(vbd->sess);
+        retval = async_req_1_0(exch, VBD_PART_DELETE, part);
+        async_exchange_end(exch);
+
+        if (retval != EOK)
+                return EIO;
+
+        return EOK;
+}
+
+void vbd_pspec_init(vbd_part_spec_t *pspec)
+{
+        memset(pspec, 0, sizeof(vbd_part_spec_t));
+}
+
 /** @}
  */

uspace/lib/c/include/ipc/vbd.h

@@ -41 +41 @@
         VBD_DISK_INFO,
         VBD_LABEL_CREATE,
-        VBD_LABEL_DELETE
+        VBD_LABEL_DELETE,
+        VBD_LABEL_GET_PARTS,
+        VBD_PART_GET_INFO,
+        VBD_PART_CREATE,
+        VBD_PART_DELETE,
 } vbd_request_t;
 

uspace/lib/c/include/vbd.h

@@ -52 +52 @@
 } vbd_disk_info_t;
 
+typedef struct {
+} vbd_part_spec_t;
+
+typedef struct {
+} vbd_part_info_t;
+
+typedef sysarg_t vbd_part_id_t;
+
 extern int vbd_create(vbd_t **);
 extern void vbd_destroy(vbd_t *);
@@ -59 +67 @@
 extern int vbd_label_create(vbd_t *, service_id_t, label_type_t);
 extern int vbd_label_delete(vbd_t *, service_id_t);
+extern int vbd_label_get_parts(vbd_t *, service_id_t, service_id_t **,
+    size_t *);
+extern int vbd_part_get_info(vbd_t *, vbd_part_id_t, vbd_part_info_t *);
+extern int vbd_part_create(vbd_t *, service_id_t, vbd_part_spec_t *,
+    vbd_part_id_t *);
+extern int vbd_part_delete(vbd_t *, vbd_part_id_t);
+extern void vbd_pspec_init(vbd_part_spec_t *);
 
 #endif

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

@@ -41 +41 @@
 #include <stdint.h>
 #include <types/label.h>
+#include <vbd.h>
 #include <vol.h>
 
@@ -126 +127 @@
         /** File system type */
         fdisk_fstype_t fstype;
+        /** Partition ID */
+        vbd_part_id_t part_id;
 } fdisk_part_t;
 
@@ -147 +150 @@
         /** Volume service */
         vol_t *vol;
+        /** Virtual Block Device */
+        vbd_t *vbd;
 } fdisk_t;
 

uspace/lib/fdisk/src/fdisk.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
+#include <vbd.h>
 #include <vol.h>
 
@@ -71 +72 @@
 int fdisk_create(fdisk_t **rfdisk)
 {
-        fdisk_t *fdisk;
+        fdisk_t *fdisk = NULL;
         int rc;
 
         fdisk = calloc(1, sizeof(fdisk_t));
-        if (fdisk == NULL)
-                return ENOMEM;
+        if (fdisk == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
 
         rc = vol_create(&fdisk->vol);
         if (rc != EOK) {
-                free(fdisk);
-                return EIO;
+                rc = EIO;
+                goto error;
+        }
+
+        rc = vbd_create(&fdisk->vbd);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
         }
 
         *rfdisk = fdisk;
         return EOK;
+error:
+        fdisk_destroy(fdisk);
+
+        return rc;
 }
 
 void fdisk_destroy(fdisk_t *fdisk)
 {
+        if (fdisk == NULL)
+                return;
+
         vol_destroy(fdisk->vol);
+        vbd_destroy(fdisk->vbd);
         free(fdisk);
 }
@@ -368 +385 @@
 {
         fdisk_part_t *part;
+        vbd_part_spec_t vpspec;
+        vbd_part_id_t partid;
+        int rc;
 
         part = calloc(1, sizeof(fdisk_part_t));
         if (part == NULL)
                 return ENOMEM;
+
+        rc = vbd_part_create(dev->fdisk->vbd, dev->sid, &vpspec, &partid);
+        if (rc != EOK) {
+                free(part);
+                return EIO;
+        }
 
         part->dev = dev;
@@ -377 +403 @@
         part->capacity = pspec->capacity;
         part->fstype = pspec->fstype;
+        part->part_id = partid;
 
         if (rpart != NULL)
@@ -385 +412 @@
 int fdisk_part_destroy(fdisk_part_t *part)
 {
+        int rc;
+
+        rc = vbd_part_delete(part->dev->fdisk->vbd, part->part_id);
+        if (rc != EOK)
+                return EIO;
+
         list_remove(&part->ldev);
         free(part);

uspace/lib/label/src/label.c

@@ -34 +34 @@
  */
 
+#include <errno.h>
+#include <label.h>
+#include <mem.h>
+#include <stdlib.h>
+
+int label_open(service_id_t sid, label_t **rlabel)
+{
+        label_t *label;
+
+        label = calloc(1, sizeof(label_t));
+        if (label == NULL)
+                return ENOMEM;
+
+        *rlabel = label;
+        return EOK;
+}
+
+int label_create(service_id_t sid, label_type_t ltype, label_t **rlabel)
+{
+        label_t *label;
+
+        label = calloc(1, sizeof(label_t));
+        if (label == NULL)
+                return ENOMEM;
+
+        *rlabel = label;
+        return EOK;
+}
+
+void label_close(label_t *label)
+{
+        free(label);
+}
+
+int label_destroy(label_t *label)
+{
+        free(label);
+        return EOK;
+}
+
+int label_get_info(label_t *label, label_info_t *linfo)
+{
+        memset(linfo, 0, sizeof(label_info_t));
+        linfo->dcnt = dc_empty;
+        return EOK;
+}
+
+label_part_t *label_part_first(label_t *label)
+{
+        return NULL;
+}
+
+label_part_t *label_part_next(label_part_t *oart)
+{
+        return NULL;
+}
+
+
+int label_part_create(label_t *label, label_part_spec_t *pspec,
+    label_part_t **rpart)
+{
+        return ENOTSUP;
+}
+
+int label_part_destroy(label_part_t *part)
+{
+        return EOK;
+}
+
+void label_pspec_init(label_part_spec_t *pspec)
+{
+        memset(pspec, 0, sizeof(label_part_spec_t));
+}
+
 /** @}
  */