python: update error handling for bindings

The error handling has changed from returning -1 and errno set to just
returing the error code. Negative values are internal errors, e.g.
-ENOMEM. Positive values are status code from the transport.

Signed-off-by: Dennis Maisenbacher <[email protected]>

Author: MaisenbacherD

libnvme/libnvme/nvme.i

@@ -55,12 +55,9 @@ PyObject *hostid_from_file();
 
 %exception nvme_ctrl::connect {
 	connect_err = 0;
-	errno = 0;
 	$action  /* $action sets connect_err to non-zero value on failure */
-	if (connect_err == 1) {
-		SWIG_exception(SWIG_AttributeError, "Existing controller connection");
-	} else if (connect_err) {
-		const char *errstr = nvme_errno_to_string(errno);
+	if (connect_err) {
+		const char *errstr = nvme_errno_to_string(-connect_err);
 		if (errstr) {
 			SWIG_exception(SWIG_RuntimeError, errstr);
 		} else {
@@ -76,7 +73,7 @@ PyObject *hostid_from_file();
 	if (connect_err == 1) {
 		SWIG_exception(SWIG_AttributeError, "No controller connection");
 	} else if (connect_err) {
-		const char *errstr = nvme_errno_to_string(errno);
+		const char *errstr = nvme_errno_to_string(-connect_err);
 		if (errstr) {
 			SWIG_exception(SWIG_RuntimeError, errstr);
 		} else {
@@ -91,7 +88,12 @@ PyObject *hostid_from_file();
 	if (discover_err == 1) {
 		SWIG_exception(SWIG_AttributeError, "No controller connection");
 	} else if (discover_err) {
-		SWIG_exception(SWIG_RuntimeError, "Discover failed");
+		const char *errstr = nvme_errno_to_string(-discover_err);
+		if (errstr) {
+			SWIG_exception(SWIG_RuntimeError, errstr);
+		} else {
+			SWIG_exception(SWIG_RuntimeError, "Discover failed");
+		}
 	}
 }
 
@@ -720,16 +722,16 @@ struct nvme_ns {
 
 		dev = nvme_ctrl_get_name($self);
 		if (dev && !cfg->duplicate_connect) {
-			connect_err = 1;
+			connect_err = -ENVME_CONNECT_ALREADY;
 			return;
 		}
 
 		Py_BEGIN_ALLOW_THREADS  /* Release Python GIL */
 		    ret = nvmf_add_ctrl(h, $self, cfg);
 		Py_END_ALLOW_THREADS    /* Reacquire Python GIL */
 
-		if (ret < 0) {
-			connect_err = 2;
+		if (ret) {
+			connect_err = ret;
 			return;
 		}
 	}
@@ -806,7 +808,7 @@ struct nvme_ns {
 			return NULL;
 		}
 		Py_BEGIN_ALLOW_THREADS  /* Release Python GIL */
-		    nvmf_get_discovery_wargs(&args, &logp);
+		    discover_err = nvmf_get_discovery_wargs(&args, &logp);
 		Py_END_ALLOW_THREADS    /* Reacquire Python GIL */
 
 		if (logp == NULL) discover_err = 2;
@@ -825,7 +827,7 @@ struct nvme_ns {
 		    ret = nvme_get_log(nvme_ctrl_get_transport_handle($self), &cmd, rae, NVME_LOG_PAGE_PDU_SIZE, NULL);
 		Py_END_ALLOW_THREADS    /* Reacquire Python GIL */
 
-		if (ret < 0) {
+		if (ret) {
 			Py_RETURN_NONE;
 		}