af3c06fdf2
qemu patches are now rebased on top of current HEAD, 3791642c8d60 Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From a6d475147682de1fe3b14eb325f4247e013e8440 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <a6d475147682de1fe3b14eb325f4247e013e8440.1619091389.git.sbrivio@redhat.com>
|
|
In-Reply-To: <ba51349d353f11e05c6341a7e065f2ade3874c68.1619091389.git.sbrivio@redhat.com>
|
|
References: <ba51349d353f11e05c6341a7e065f2ade3874c68.1619091389.git.sbrivio@redhat.com>
|
|
From: Stefano Brivio <sbrivio@redhat.com>
|
|
Date: Wed, 21 Apr 2021 18:52:16 +0200
|
|
Subject: [PATCH 2/2] net: Don't ignore EINVAL on netdev socket connection
|
|
|
|
Other errors are treated as failure by net_socket_connect_init(),
|
|
but if connect() returns EINVAL, we'll fail silently. Remove the
|
|
related exception.
|
|
|
|
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
|
|
---
|
|
net/socket.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/net/socket.c b/net/socket.c
|
|
index aadd11dae2b3..d3293ac12e82 100644
|
|
--- a/net/socket.c
|
|
+++ b/net/socket.c
|
|
@@ -644,8 +644,7 @@ static int net_socket_connect_init(NetClientState *peer,
|
|
if (errno == EINTR || errno == EWOULDBLOCK) {
|
|
/* continue */
|
|
} else if (errno == EINPROGRESS ||
|
|
- errno == EALREADY ||
|
|
- errno == EINVAL) {
|
|
+ errno == EALREADY) {
|
|
break;
|
|
} else {
|
|
error_setg_errno(errp, errno, "can't connect socket");
|
|
--
|
|
2.29.2
|
|
|