commit 249d0344d413e4288f1563d7d6c59087c534b3e2
author Sean Klein <smklein@google.com> Fri Apr 26 03:31:56 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Apr 26 03:31:56 2019 +0000
tree 9d2f60468dd1c9feea045b49d7f1de018fdd3217
parent d28f1e75310cd84c05e89215d8c042406b4399c7

[fvm][blobfs] Increase logging for FVM binding failures

FLK-182 #comment In Progress

Change-Id: I665fa458582f14b8dbcfde8fadfe7be1792e3bee

zircon/system/dev/block/fvm/fvm.cpp

diff --git a/zircon/system/dev/block/fvm/fvm.cpp b/zircon/system/dev/block/fvm/fvm.cpp
index 408fed6..2e29fb0 100644
--- a/zircon/system/dev/block/fvm/fvm.cpp
+++ b/zircon/system/dev/block/fvm/fvm.cpp
@@ -20,6 +20,7 @@
 #include <lib/zx/vmo.h>
 #include <zircon/compiler.h>
 #include <zircon/device/block.h>
+#include <zircon/status.h>
 #include <zircon/syscalls.h>
 #include <zircon/thread_annotations.h>
 
@@ -51,8 +52,8 @@
     block_impl_protocol_t bp;
     size_t block_op_size = 0;
     if (device_get_protocol(dev, ZX_PROTOCOL_BLOCK, &bp) != ZX_OK) {
-        printf("fvm: ERROR: block device '%s': does not support block protocol\n",
-               device_get_name(dev));
+        fprintf(stderr, "fvm: ERROR: block device '%s': does not support block protocol\n",
+                device_get_name(dev));
         return ZX_ERR_NOT_SUPPORTED;
     }
     bp.ops->query(bp.ctx, &block_info, &block_op_size);
@@ -61,6 +62,8 @@
 
     zx_status_t status = vpm->DdkAdd("fvm", DEVICE_ADD_INVISIBLE);
     if (status != ZX_OK) {
+        fprintf(stderr, "fvm: ERROR: block device '%s': failed to DdkAdd: %s\n",
+                device_get_name(dev), zx_status_get_string(status));
         return status;
     }
 
@@ -68,6 +71,8 @@
     int rc =
         thrd_create_with_name(&vpm->initialization_thread_, FvmLoadThread, vpm.get(), "fvm-init");
     if (rc < 0) {
+        fprintf(stderr, "fvm: ERROR: block device '%s': Could not load initialization thread\n",
+                device_get_name(dev));
         // See comment in Load()
         if (!vpm->device_remove_.exchange(true)) {
             vpm->DdkRemove();

zircon/system/utest/blobfs/blobfs.cpp

diff --git a/zircon/system/utest/blobfs/blobfs.cpp b/zircon/system/utest/blobfs/blobfs.cpp
index 37be870..a8447723 100644
--- a/zircon/system/utest/blobfs/blobfs.cpp
+++ b/zircon/system/utest/blobfs/blobfs.cpp
@@ -272,7 +272,7 @@
         caller.reset();
 
         snprintf(fvm_path_, sizeof(fvm_path_), "%s/fvm", device_path_);
-        ASSERT_EQ(wait_for_device(fvm_path_, ZX_SEC(3)), ZX_OK,
+        ASSERT_EQ(wait_for_device(fvm_path_, zx::sec(10).get()), ZX_OK,
                   "[FAILED]: FVM driver never appeared");
 
         // Open "fvm" driver.