Changeset 3faa03d in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2015-07-02T16:30:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1626cd4

Parents:

78d50bd

Message:

Liblabel reading GPT and MBR partitions (primary only).

File:

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

uspace/srv/bd/vbd/disk.c

@@ -96 +96 @@
 static int vbds_part_by_id(vbds_part_id_t partid, vbds_part_t **rpart)
 {
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_part_by_id(%zu)", partid);
+
         list_foreach(vbds_parts, lparts, vbds_part_t, part) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "%zu == %zu ?", part->id, partid);
                 if (part->id == partid) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Found match.");
                         *rpart = part;
                         return EOK;
@@ -103 +107 @@
         }
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "No match.");
         return ENOENT;
 }
@@ -146 +151 @@
         part->lpart = lpart;
         part->disk = disk;
+        part->id = (vbds_part_id_t)psid;
         part->block0 = lpinfo.block0;
         part->nblocks = lpinfo.nblocks;
@@ -161 +167 @@
 int vbds_disk_add(service_id_t sid)
 {
-        label_t *label;
+        label_t *label = NULL;
         label_part_t *part;
         vbds_disk_t *disk = NULL;
@@ -206 +212 @@
         rc = label_open(sid, &label);
         if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Label in disk %s not recognized.",
+                    disk->svc_name);
                 rc = EIO;
                 goto error;
@@ -216 +224 @@
         list_initialize(&disk->parts);
         list_append(&disk->ldisks, &vbds_disks);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Recognized disk label. Adding partitions.");
 
         part = label_part_first(label);
@@ -462 +472 @@
 static int vbds_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
+        vbds_part_t *part = bd_srv_part(bd);
+
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_bd_get_block_size()");
+        *rsize = part->disk->block_size;
         return EOK;
 }
@@ -468 +481 @@
 static int vbds_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
+        vbds_part_t *part = bd_srv_part(bd);
+
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_bd_get_num_blocks()");
+        *rnb = part->nblocks;
         return EOK;
 }
@@ -478 +494 @@
         service_id_t partid;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_bd_conn()");
+
         partid = IPC_GET_ARG1(*icall);
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_bd_conn() - partid=%zu", partid);
+
         rc = vbds_part_by_id(partid, &part);
         if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "vbd_bd_conn() - partition "
+                    "not found.");
                 async_answer_0(iid, EINVAL);
                 return;
         }
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_bd_conn() - call bd_conn");
         bd_conn(iid, icall, &part->bds);
 }