From: Fam Zheng <famz@redhat.com>
Date: Fri, 4 Apr 2014 11:53:29 +0000 (+0800)
Subject: iscsi: Don't set error if already set in iscsi_do_inquiry
X-Git-Tag: qemu-xen-4.5.0-rc1~50^2~9
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cbee81f6de57ddc1b21ba28f01f6a3b5d87428a5;p=qemu-upstream-4.5-testing.git

iscsi: Don't set error if already set in iscsi_do_inquiry

This eliminates the possible assertion failure in error_setg().

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/iscsi.c b/block/iscsi.c
index 21c18a39d..64a509f8f 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1101,8 +1101,10 @@ static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun,
     return task;
 
 fail:
-    error_setg(errp, "iSCSI: Inquiry command failed : %s",
-               iscsi_get_error(iscsi));
+    if (!error_is_set(errp)) {
+        error_setg(errp, "iSCSI: Inquiry command failed : %s",
+                   iscsi_get_error(iscsi));
+    }
     if (task != NULL) {
         scsi_free_scsi_task(task);
     }