[PATCH 1/3] iscsi: Check for presence of error before creating new one

[John Ferlan <jferlan@xxxxxxxxxx>]

If virStorageBackendSCSIFindLUs fails, but the failure has an error
message - the iscsi code didn't honor that creating it's own wonderful
message such as "error: Failed to find LUs on host 60: ..." - not overly
helpful. Since a few of the called paths generate a message, check for
that before using that generic one.

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/storage/storage_backend_iscsi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index 079c767..1dac238 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -147,8 +147,9 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool,
     }
 
     if (virStorageBackendSCSIFindLUs(pool, host) < 0) {
-        virReportSystemError(errno,
-                             _("Failed to find LUs on host %u"), host);
+        if (virGetLastError() == NULL)
+            virReportSystemError(errno,
+                                 _("Failed to find LUs on host %u"), host);
         retval = -1;
     }
 
-- 
2.1.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list