From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW2l8-0007PP-3M for qemu-devel@nongnu.org; Fri, 04 Apr 2014 07:58:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WW2l1-0000wk-Uh for qemu-devel@nongnu.org; Fri, 04 Apr 2014 07:58:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW2l1-0000wf-NN for qemu-devel@nongnu.org; Fri, 04 Apr 2014 07:58:03 -0400 Message-ID: <533E9E1F.6080909@redhat.com> Date: Fri, 04 Apr 2014 13:57:19 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1396612409-17932-1-git-send-email-famz@redhat.com> In-Reply-To: <1396612409-17932-1-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for-2.0] iscsi: Don't set error if already set in iscsi_do_inquiry List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Stefan Hajnoczi Il 04/04/2014 13:53, Fam Zheng ha scritto: > This eliminates the possible assertion failure in error_setg(). > > Signed-off-by: Fam Zheng > --- > block/iscsi.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/block/iscsi.c b/block/iscsi.c > index 21c18a3..64a509f 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); > } > Reviewed-by: Paolo Bonzini Kevin, Stefan, can you send the pull request for this? Paolo