5e258fbe95
- kvm-scsi-fetch-unit-attention-when-creating-the-request.patch [bz#2176702] - kvm-scsi-cleanup-scsi_clear_unit_attention.patch [bz#2176702] - kvm-scsi-clear-unit-attention-only-for-REPORT-LUNS-comma.patch [bz#2176702] - kvm-s390x-ap-Wire-up-the-device-request-notifier-interfa.patch [RHEL-794] - kvm-multifd-Create-property-multifd-flush-after-each-sec.patch [bz#2196295] - kvm-multifd-Protect-multifd_send_sync_main-calls.patch [bz#2196295] - kvm-multifd-Only-flush-once-each-full-round-of-memory.patch [bz#2196295] - kvm-net-socket-prepare-to-cleanup-net_init_socket.patch [RHEL-582] - kvm-net-socket-move-fd-type-checking-to-its-own-function.patch [RHEL-582] - kvm-net-socket-remove-net_init_socket.patch [RHEL-582] - kvm-pcie-Add-hotplug-detect-state-register-to-cmask.patch [bz#2215819] - kvm-spec-Build-DBUS-display.patch [bz#2207940] - Resolves: bz#2176702 ([RHEL9][virtio-scsi] scsi-hd cannot hot-plug successfully after hot-plug it repeatly) - Resolves: RHEL-794 (Backport s390x fixes from QEMU 8.1) - Resolves: bz#2196295 (Multifd flushes its channels 10 times per second) - Resolves: RHEL-582 ([passt][rhel 9.3] qemu core dump occurs when guest is shutdown after hotunplug/hotplug a passt interface) - Resolves: bz#2215819 (Migration test failed while guest with PCIe devices) - Resolves: bz#2207940 ([RFE] Enable qemu-ui-dbus subpackage)
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From a467540e49e76c5961d86e3f47d3f8fcad8cef09 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Fri, 9 Jun 2023 09:27:46 +0200
|
|
Subject: [PATCH 08/12] net: socket: prepare to cleanup net_init_socket()
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
RH-MergeRequest: 187: net: socket: do not close file descriptor if it's not a socket
|
|
RH-Jira: RHEL-582
|
|
RH-Acked-by: Stefano Brivio <None>
|
|
RH-Acked-by: Jason Wang <jasowang@redhat.com>
|
|
RH-Acked-by: David Gibson (Red Hat) <dgibson@redhat.com>
|
|
RH-Commit: [1/3] 3e4f8370586ae1ac2474fef971a239edb31eeb67 (lvivier/qemu-kvm-centos)
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-582
|
|
|
|
Use directly net_socket_fd_init_stream() and net_socket_fd_init_dgram()
|
|
when the socket type is already known.
|
|
|
|
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
(cherry picked from commit 006c3fa74c3edb978ff46d2851699e9a95609da5)
|
|
---
|
|
net/socket.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/net/socket.c b/net/socket.c
|
|
index ba6e5b0b00..24dcaa55bc 100644
|
|
--- a/net/socket.c
|
|
+++ b/net/socket.c
|
|
@@ -587,7 +587,7 @@ static int net_socket_connect_init(NetClientState *peer,
|
|
break;
|
|
}
|
|
}
|
|
- s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp);
|
|
+ s = net_socket_fd_init_stream(peer, model, name, fd, connected);
|
|
if (!s) {
|
|
return -1;
|
|
}
|
|
@@ -629,7 +629,7 @@ static int net_socket_mcast_init(NetClientState *peer,
|
|
return -1;
|
|
}
|
|
|
|
- s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
|
|
+ s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
|
|
if (!s) {
|
|
return -1;
|
|
}
|
|
@@ -683,7 +683,7 @@ static int net_socket_udp_init(NetClientState *peer,
|
|
}
|
|
qemu_socket_set_nonblock(fd);
|
|
|
|
- s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
|
|
+ s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
|
|
if (!s) {
|
|
return -1;
|
|
}
|
|
--
|
|
2.39.3
|
|
|