From: Hannes Reinecke <hare@suse.de>
Date: Thu, 24 Jun 2021 06:28:09 +0000 (+0200)
Subject: libnvme.i: display last error message on connect()
X-Git-Tag: v1.0-rc0~121^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6d29e04fe89bf4f0cf8240c7f54330179cb46a7e;p=users%2Fsagi%2Flibnvme.git

libnvme.i: display last error message on connect()

Instead of displaying just a generic 'connect failed' message
we should be using nvme_log_message to display the most recent
failure message to the user.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/src/nvme/libnvme.i b/src/nvme/libnvme.i
index a754aeba..7f16eb37 100644
--- a/src/nvme/libnvme.i
+++ b/src/nvme/libnvme.i
@@ -18,6 +18,7 @@
 #include "tree.h"
 #include "fabrics.h"
 #include "private.h"
+#include "log.h"
 
 static int host_iter_err = 0;
 static int subsys_iter_err = 0;
@@ -97,7 +98,10 @@ static int discover_err = 0;
     SWIG_exception(SWIG_AttributeError, "Existing controller connection");
   } else if (connect_err) {
     connect_err = 0;
-    SWIG_exception(SWIG_RuntimeError, "Connect failed");
+    if (nvme_log_message)
+      SWIG_exception(SWIG_RuntimeError, nvme_log_message);
+    else
+      SWIG_exception(SWIG_RuntimeError, "Connect failed");
   }
 }
 
@@ -314,6 +318,7 @@ struct nvme_ns {
 
 %extend nvme_root {
   nvme_root(const char *config_file = NULL) {
+    nvme_log_level = LOG_ERR;
     return nvme_scan(config_file);
   }
   ~nvme_root() {