Merge pull request #202 from hreinecke/msg-redirect

Redirect error messages

Author: hreinecke

doc/libnvme.rst

@@ -5840,14 +5840,6 @@ The nvme command status if a response was received (see
 ``nvme_subsystem_t s``
 
 
-.. c:function:: nvme_root_t nvme_scan_filter (nvme_scan_filter_t f)
-
-
-**Parameters**
-
-``nvme_scan_filter_t f``
-
-
 .. c:function:: nvme_root_t nvme_scan ()
 
 

doc/man/nvme_scan_filter.2

@@ -63,7 +63,7 @@ int main()
 		fprintf(stderr, "Failed to allocated memory\n");
 		return ENOMEM;
 	}
-	c = nvme_create_ctrl(NVME_DISC_SUBSYS_NAME, "loop",
+	c = nvme_create_ctrl(r, NVME_DISC_SUBSYS_NAME, "loop",
 			     NULL, NULL, NULL, NULL);
 	if (!c) {
 		fprintf(stderr, "Failed to allocate memory\n");

examples/discover-loop.c

@@ -339,29 +339,30 @@ 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() {
     nvme_free_tree($self);
   }
   void log_level(const char *level) {
+    int log_level = DEFAULT_LOGLEVEL;
     if (!strcmp(level,"debug"))
-      nvme_log_level = LOG_DEBUG;
+      log_level = LOG_DEBUG;
     else if (!strcmp(level, "info"))
-      nvme_log_level = LOG_INFO;
+      log_level = LOG_INFO;
     else if (!strcmp(level, "notice"))
-      nvme_log_level = LOG_NOTICE;
+      log_level = LOG_NOTICE;
     else if (!strcmp(level, "warning"))
-      nvme_log_level = LOG_WARNING;
+      log_level = LOG_WARNING;
     else if (!strcmp(level, "err"))
-      nvme_log_level = LOG_ERR;
+      log_level = LOG_ERR;
     else if (!strcmp(level, "crit"))
-      nvme_log_level = LOG_CRIT;
+      log_level = LOG_CRIT;
     else if (!strcmp(level, "alert"))
-      nvme_log_level = LOG_ALERT;
+      log_level = LOG_ALERT;
     else if (!strcmp(level, "emerg"))
-      nvme_log_level = LOG_EMERG;
+      log_level = LOG_EMERG;
+    nvme_init_logging($self, log_level, false, false);
   }
   struct nvme_host *hosts() {
     return nvme_first_host($self);
@@ -508,10 +509,10 @@ struct nvme_ns {
 }
 
 %extend nvme_ctrl {
-  nvme_ctrl(const char *subsysnqn, const char *transport,
+  nvme_ctrl(struct nvme_root *r, const char *subsysnqn, const char *transport,
 	    const char *traddr = NULL, const char *host_traddr = NULL,
 	    const char *host_iface = NULL, const char *trsvcid = NULL) {
-    return nvme_create_ctrl(subsysnqn, transport, traddr,
+    return nvme_create_ctrl(r, subsysnqn, transport, traddr,
 			    host_traddr, host_iface, trsvcid);
   }
   ~nvme_ctrl() {

libnvme/nvme.i

@@ -11,4 +11,4 @@
 transport = 'loop'
 traddr    = '127.0.0.1'
 trsvcid   = '8009'
-ctrl = nvme.ctrl(subsysnqn=subsysnqn, transport=transport, traddr=traddr, trsvcid=trsvcid)
+ctrl = nvme.ctrl(root, subsysnqn=subsysnqn, transport=transport, traddr=traddr, trsvcid=trsvcid)

libnvme/tests/create-ctrl-obj.py

@@ -8,6 +8,7 @@ LIBNVME_1_0 {
 		nvme_capacity_mgmt;
 		nvme_compare;
 		nvme_copy;
+		nvme_create_root;
 		nvme_create_ctrl;
 		nvme_ctrl_disconnect;
 		nvme_ctrl_first_ns;
@@ -169,12 +170,12 @@ LIBNVME_1_0 {
 		nvme_init_ctrl;
 		nvme_init_ctrl_list;
 		nvme_init_dsm_range;
+		nvme_init_logging;
 		nvme_init_id_ns;
 		nvme_io;
 		nvme_io_passthru64;
 		nvme_io_passthru;
 		nvme_lockdown;
-		nvme_log_level;
 		nvme_lookup_host;
 		nvme_lookup_subsystem;
 		nvme_namespace_attach_ctrls;
@@ -227,6 +228,7 @@ LIBNVME_1_0 {
 		nvme_path_get_sysfs_dir;
 		nvme_paths_filter;
 		nvme_read;
+		nvme_read_config;
 		nvme_refresh_topology;
 		nvme_rescan_ctrl;
 		nvme_reset_topology;
@@ -240,7 +242,7 @@ LIBNVME_1_0 {
 		nvme_scan_ctrl;
 		nvme_scan_ctrl_namespace_paths;
 		nvme_scan_ctrl_namespaces;
-		nvme_scan_filter;
+		nvme_scan_topology;
 		nvme_scan_namespace;
 		nvme_scan_subsystem_namespaces;
 		nvme_scan_subsystems;