Changeset 372df8f in mainline for uspace/srv/bd/vbd/vbd.c

Timestamp:

2015-10-09T07:00:23Z (9 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.

File:

• uspace/srv/bd/vbd/vbd.c (modified) (3 diffs)

uspace/srv/bd/vbd/vbd.c

@@ -60 +60 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_init()");
 
-        vbds_disks_init();
+        rc = vbds_disks_init();
+        if (rc != EOK)
+                return rc;
+
+        rc = vbds_disk_discovery_start();
+        if (rc != EOK)
+                return rc;
 
         async_set_client_connection(vbds_client_conn);
@@ -79 +85 @@
 }
 
-
-static void vbds_disk_add_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-        service_id_t disk_sid;
-        int rc;
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_disk_add_srv()");
-
-        disk_sid = IPC_GET_ARG1(*icall);
-        rc = vbds_disk_add(disk_sid);
-        async_answer_0(iid, (sysarg_t) rc);
-}
-
-static void vbds_disk_remove_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-        service_id_t disk_sid;
-        int rc;
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_disk_remove_srv()");
-
-        disk_sid = IPC_GET_ARG1(*icall);
-        rc = vbds_disk_remove(disk_sid);
-        async_answer_0(iid, (sysarg_t) rc);
+static void vbds_get_disks_srv(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        int rc;
+
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        service_id_t *id_buf = (service_id_t *) malloc(size);
+        if (id_buf == NULL) {
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        rc = vbds_disk_get_ids(id_buf, size, &act_size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
+        free(id_buf);
+
+        async_answer_1(iid, retval, act_size);
 }
 
@@ -362 +376 @@
 
                 switch (method) {
-                case VBD_DISK_ADD:
-                        vbds_disk_add_srv(callid, &call);
-                        break;
-                case VBD_DISK_REMOVE:
-                        vbds_disk_remove_srv(callid, &call);
+                case VBD_GET_DISKS:
+                        vbds_get_disks_srv(callid, &call);
                         break;
                 case VBD_DISK_INFO: