Changeset 6bc542b in mainline for uspace/lib/c/generic/vbd.c

Timestamp:

2015-07-02T21:53:12Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99c23405

Parents:

6a0d4ce2

Message:

Allocate and create partition with libfdisk (except actual modification of on-disk label).

File:

• uspace/lib/c/generic/vbd.c (modified) (4 diffs)

uspace/lib/c/generic/vbd.c

@@ -107 +107 @@
 }
 
-#include <io/log.h>
 /** Get disk information. */
 int vbd_disk_info(vbd_t *vbd, service_id_t sid, vbd_disk_info_t *vinfo)
@@ -115 +114 @@
         ipc_call_t answer;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() begin exchange");
         exch = async_exchange_begin(vbd->sess);
         aid_t req = async_send_1(exch, VBD_DISK_INFO, sid, &answer);
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() read start");
         int rc = async_data_read_start(exch, vinfo, sizeof(vbd_disk_info_t));
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() end exch");
         async_exchange_end(exch);
 
@@ -128 +124 @@
         }
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() wait fore req reply");
         async_wait_for(req, &retval);
         if (retval != EOK)
                 return EIO;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_disk_info() done");
         return EOK;
 }
@@ -293 +287 @@
 {
         async_exch_t *exch;
-        sysarg_t part;
+        sysarg_t retval;
+        ipc_call_t answer;
+
+        exch = async_exchange_begin(vbd->sess);
+        aid_t req = async_send_1(exch, VBD_PART_CREATE, disk, &answer);
+        int rc = async_data_write_start(exch, pspec, sizeof(vbd_part_spec_t));
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return EIO;
+
+        *rpart = (vbd_part_id_t)IPC_GET_ARG1(answer);
+        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_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);