From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYC6o-00077h-Qt for qemu-devel@nongnu.org; Wed, 18 Mar 2015 07:25:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYC6o-0001iV-0d for qemu-devel@nongnu.org; Wed, 18 Mar 2015 07:25:58 -0400 Received: from mail-wg0-x233.google.com ([2a00:1450:400c:c00::233]:36682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYC6n-0001iP-RG for qemu-devel@nongnu.org; Wed, 18 Mar 2015 07:25:57 -0400 Received: by wgra20 with SMTP id a20so32373958wgr.3 for ; Wed, 18 Mar 2015 04:25:57 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Mar 2015 12:24:51 +0100 Message-Id: <1426677906-51657-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1426677906-51657-1-git-send-email-pbonzini@redhat.com> References: <1426677906-51657-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 04/19] nbd: Fix nbd_establish_connection()'s return value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Max Reitz From: Max Reitz unix_connect_opts() and inet_connect_opts() do not necessarily set errno (if at all); therefore, nbd_establish_connection() should not literally return -errno on error. Signed-off-by: Max Reitz Message-Id: <1424887718-10800-4-git-send-email-mreitz@redhat.com> Signed-off-by: Paolo Bonzini --- block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nbd.c b/block/nbd.c index 6634a69..2176186 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -248,7 +248,7 @@ static int nbd_establish_connection(BlockDriverState *bs, Error **errp) /* Failed to establish connection */ if (sock < 0) { logout("Failed to establish connection to NBD server\n"); - return -errno; + return -EIO; } return sock; -- 2.3.0