Changeset 372df8f in mainline for uspace/lib/c

Timestamp:

2015-10-09T07:00:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0ecfc62

Parents:

0bde8523

Message:

Let VBD handle unlabeled devices too. Now volsrv only cares about partitions.

Location:

uspace/lib/c

Files:

• generic/vbd.c (modified) (2 diffs)
• generic/vol.c (modified) (6 diffs)
• include/ipc/vbd.h (modified) (1 diff)
• include/ipc/vol.h (modified) (1 diff)
• include/types/label.h (modified) (2 diffs)
• include/vbd.h (modified) (1 diff)
• include/vol.h (modified) (1 diff)

uspace/lib/c/generic/vbd.c

@@ -43 +43 @@
 #include <vbd.h>
 
+static int vbd_get_ids_internal(vbd_t *, sysarg_t, sysarg_t, sysarg_t **,
+    size_t *);
+
 int vbd_create(vbd_t **rvbd)
 {
@@ -85 +88 @@
 }
 
-int vbd_disk_add(vbd_t *vbd, service_id_t disk_sid)
-{
-        async_exch_t *exch;
-
-        exch = async_exchange_begin(vbd->sess);
-        sysarg_t rc = async_req_1_0(exch, VBD_DISK_ADD, disk_sid);
-        async_exchange_end(exch);
-
-        return (int)rc;
-}
-
-int vbd_disk_remove(vbd_t *vbd, service_id_t disk_sid)
-{
-        async_exch_t *exch;
-
-        exch = async_exchange_begin(vbd->sess);
-        sysarg_t rc = async_req_1_0(exch, VBD_DISK_REMOVE, disk_sid);
-        async_exchange_end(exch);
-
-        return (int)rc;
+/** Get list of partitions as array of service IDs.
+ *
+ * @param vbd Virtual block device service
+ * @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_get_disks(vbd_t *vbd, service_id_t **data, size_t *count)
+{
+        return vbd_get_ids_internal(vbd, VBD_GET_DISKS, 0, data, count);
 }
 

uspace/lib/c/generic/vol.c

@@ -175 +175 @@
 }
 
-/** Get list of disks as array of service IDs.
+/** Get list of partitions as array of service IDs.
  *
  * @param vol Volume service
@@ -183 +183 @@
  * @return EOK on success or negative error code
  */
-int vol_get_disks(vol_t *vol, service_id_t **data, size_t *count)
-{
-        return vol_get_ids_internal(vol, VOL_GET_DISKS, 0, data, count);
-}
-
-/** Get disk information. */
-int vol_disk_info(vol_t *vol, service_id_t sid, vol_disk_info_t *vinfo)
+int vol_get_parts(vol_t *vol, service_id_t **data, size_t *count)
+{
+        return vol_get_ids_internal(vol, VOL_GET_PARTS, 0, data, count);
+}
+
+/** Get partition information. */
+int vol_part_info(vol_t *vol, service_id_t sid, vol_part_info_t *vinfo)
 {
         async_exch_t *exch;
@@ -196 +196 @@
 
         exch = async_exchange_begin(vol->sess);
-        retval = async_req_1_3(exch, VOL_DISK_INFO, sid, &dcnt, &ltype,
+        retval = async_req_1_3(exch, VOL_PART_INFO, sid, &dcnt, &ltype,
             &flags);
         async_exchange_end(exch);
@@ -209 +209 @@
 }
 
-/** Create new label. */
-int vol_label_create(vol_t *vol, service_id_t sid, label_type_t ltype)
+/** Erase partition (to the extent where we will consider it not containing
+ * a file system. */
+int vol_part_empty(vol_t *vol, service_id_t sid)
 {
         async_exch_t *exch;
@@ -216 +217 @@
 
         exch = async_exchange_begin(vol->sess);
-        retval = async_req_2_0(exch, VOL_LABEL_CREATE, sid, ltype);
+        retval = async_req_1_0(exch, VOL_PART_EMPTY, sid);
         async_exchange_end(exch);
 
@@ -225 +226 @@
 }
 
-/** Erase disk (to the extent where we will consider it not containing
- * a label or file system. */
-int vol_disk_empty(vol_t *vol, service_id_t sid)
-{
-        async_exch_t *exch;
-        int retval;
-
-        exch = async_exchange_begin(vol->sess);
-        retval = async_req_1_0(exch, VOL_DISK_EMPTY, sid);
-        async_exchange_end(exch);
-
-        if (retval != EOK)
-                return EIO;
-
-        return EOK;
-}
-
 /** @}
  */

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

@@ -37 +37 @@
 
 typedef enum {
-        VBD_DISK_ADD = IPC_FIRST_USER_METHOD,
-        VBD_DISK_REMOVE,
+        VBD_GET_DISKS = IPC_FIRST_USER_METHOD,
         VBD_DISK_INFO,
         VBD_LABEL_CREATE,

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

@@ -37 +37 @@
 
 typedef enum {
-        VOL_GET_DISKS = IPC_FIRST_USER_METHOD,
-        VOL_DISK_INFO,
-        VOL_LABEL_CREATE,
-        VOL_DISK_EMPTY
+        VOL_GET_PARTS = IPC_FIRST_USER_METHOD,
+        VOL_PART_INFO,
+        VOL_PART_EMPTY
 } vol_request_t;
 

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

@@ -52 +52 @@
 /** Disk label type */
 typedef enum {
+        /** No label */
+        lt_none,
         /** BIOS Master Boot Record */
         lt_mbr,
@@ -58 +60 @@
 } label_type_t;
 
+#define LT_FIRST (lt_mbr)
 #define LT_LIMIT (lt_gpt + 1)
 

uspace/lib/c/include/vbd.h

@@ -93 +93 @@
 extern int vbd_create(vbd_t **);
 extern void vbd_destroy(vbd_t *);
-extern int vbd_disk_add(vbd_t *, service_id_t);
-extern int vbd_disk_remove(vbd_t *, service_id_t);
+extern int vbd_get_disks(vbd_t *, service_id_t **, size_t *);
 extern int vbd_disk_info(vbd_t *, service_id_t, vbd_disk_info_t *);
 extern int vbd_label_create(vbd_t *, service_id_t, label_type_t);

uspace/lib/c/include/vol.h

@@ -47 +47 @@
 } vol_t;
 
-/** Disk information */
+/** Partition information */
 typedef struct {
-        /** Disk contents */
+        /** Partition contents */
         label_disk_cnt_t dcnt;
-        /** Label type, if disk contents is label */
+        /** Label type, if partition contents is label XXX */
         label_type_t ltype;
         /** Label flags */
         label_flags_t flags;
-} vol_disk_info_t;
+} vol_part_info_t;
 
 extern int vol_create(vol_t **);
 extern void vol_destroy(vol_t *);
-extern int vol_get_disks(vol_t *, service_id_t **, size_t *);
-extern int vol_disk_info(vol_t *, service_id_t, vol_disk_info_t *);
-extern int vol_label_create(vol_t *, service_id_t, label_type_t);
-extern int vol_disk_empty(vol_t *, service_id_t);
+extern int vol_get_parts(vol_t *, service_id_t **, size_t *);
+extern int vol_part_info(vol_t *, service_id_t, vol_part_info_t *);
+extern int vol_part_empty(vol_t *, service_id_t);
 
 #endif