Changeset f57ccb5 in mainline for uspace/srv

Timestamp:

2015-08-11T16:03:59Z (10 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.

Location:

uspace/srv/bd/vbd

Files:

• disk.c (modified) (2 diffs)
• disk.h (modified) (1 diff)
• vbd.c (modified) (3 diffs)

uspace/srv/bd/vbd/disk.c

@@ -503 +503 @@
         rc = vbds_disk_by_svcid(sid, &disk);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Partition %zu not found",
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Disk %zu not found",
                     sid);
                 goto error;
@@ -583 +583 @@
 
         return EOK;
+}
+
+int vbds_suggest_ptype(service_id_t sid, label_pcnt_t pcnt,
+    label_ptype_t *ptype)
+{
+        vbds_disk_t *disk;
+        int rc;
+
+        rc = vbds_disk_by_svcid(sid, &disk);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Disk %zu not found",
+                    sid);
+                goto error;
+        }
+
+        rc = label_suggest_ptype(disk->label, pcnt, ptype);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "label_suggest_ptype() failed");
+                goto error;
+        }
+
+        return EOK;
+error:
+        return rc;
 }
 

uspace/srv/bd/vbd/disk.h

@@ -52 +52 @@
 extern int vbds_part_create(service_id_t, vbd_part_spec_t *,vbds_part_id_t *);
 extern int vbds_part_delete(vbds_part_id_t);
+extern int vbds_suggest_ptype(service_id_t, label_pcnt_t, label_ptype_t *);
 extern void vbds_bd_conn(ipc_callid_t, ipc_call_t *, void *);
 

uspace/srv/bd/vbd/vbd.c

@@ -208 +208 @@
 }
 
-
 static void vbds_part_get_info_srv(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -302 +301 @@
 }
 
+static void vbds_suggest_ptype_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        service_id_t disk_sid;
+        label_ptype_t ptype;
+        label_pcnt_t pcnt;
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_suggest_ptype_srv()");
+
+        disk_sid = IPC_GET_ARG1(*icall);
+        pcnt = IPC_GET_ARG2(*icall);
+
+        rc = vbds_suggest_ptype(disk_sid, pcnt, &ptype);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(label_ptype_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        rc = async_data_read_finalize(callid, &ptype, sizeof(label_ptype_t));
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        async_answer_0(iid, EOK);
+}
+
 static void vbds_ctl_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -348 +389 @@
                         vbds_part_delete_srv(callid, &call);
                         break;
+                case VBD_SUGGEST_PTYPE:
+                        vbds_suggest_ptype_srv(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, EINVAL);