diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2021-04-22 13:36:53 +0200 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2021-04-22 13:36:53 +0200 |
| commit | af3c06fdf28fcc8cfd75f148b307c682ef7388da (patch) | |
| tree | 31f63bdd5ece24ef02aad138bcd26e46e2962963 /qemu/0002-net-Don-t-ignore-EINVAL-on-netdev-socket-connection.patch | |
| parent | 89478bd251968a026142d4578e3661398a7b8c7f (diff) | |
| download | passt-af3c06fdf28fcc8cfd75f148b307c682ef7388da.tar passt-af3c06fdf28fcc8cfd75f148b307c682ef7388da.tar.gz passt-af3c06fdf28fcc8cfd75f148b307c682ef7388da.tar.bz2 passt-af3c06fdf28fcc8cfd75f148b307c682ef7388da.tar.lz passt-af3c06fdf28fcc8cfd75f148b307c682ef7388da.tar.xz passt-af3c06fdf28fcc8cfd75f148b307c682ef7388da.tar.zst passt-af3c06fdf28fcc8cfd75f148b307c682ef7388da.zip | |
qemu: Rebase patches on latest upstream
qemu patches are now rebased on top of current HEAD, 3791642c8d60
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'qemu/0002-net-Don-t-ignore-EINVAL-on-netdev-socket-connection.patch')
| -rw-r--r-- | qemu/0002-net-Don-t-ignore-EINVAL-on-netdev-socket-connection.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/qemu/0002-net-Don-t-ignore-EINVAL-on-netdev-socket-connection.patch b/qemu/0002-net-Don-t-ignore-EINVAL-on-netdev-socket-connection.patch index 0e2caa8..0b3cf7a 100644 --- a/qemu/0002-net-Don-t-ignore-EINVAL-on-netdev-socket-connection.patch +++ b/qemu/0002-net-Don-t-ignore-EINVAL-on-netdev-socket-connection.patch @@ -1,6 +1,9 @@ -From f4c9af4041754209eaad4f98041466b6f5e54902 Mon Sep 17 00:00:00 2001 +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, 17 Mar 2021 10:35:32 +0100 +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(), @@ -13,10 +16,10 @@ Signed-off-by: Stefano Brivio <sbrivio@redhat.com> 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/socket.c b/net/socket.c -index 9d06953983..a7c10ea2b2 100644 +index aadd11dae2b3..d3293ac12e82 100644 --- a/net/socket.c +++ b/net/socket.c -@@ -671,8 +671,7 @@ static int net_socket_connect_init(NetClientState *peer, +@@ -644,8 +644,7 @@ static int net_socket_connect_init(NetClientState *peer, if (errno == EINTR || errno == EWOULDBLOCK) { /* continue */ } else if (errno == EINPROGRESS || @@ -27,5 +30,5 @@ index 9d06953983..a7c10ea2b2 100644 } else { error_setg_errno(errp, errno, "can't connect socket"); -- -2.28.0 +2.29.2 |