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 a754aebaf7e7e35b118787d8df48c44b9d89fdd8..7f16eb37a48903fb5fa6ba7904d51d6f025abf98 100644 (file)
--- 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() {