mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vhost-user: Drop misleading EAGAIN checks in slave_read()

Browse Source 
slave_read() checks EAGAIN when reading or writing to the socket
fails. This gives the impression that the slave channel is in
non-blocking mode, which is certainly not the case with the current
code base. And the rest of the code isn't actually ready to cope
with non-blocking I/O.

Just drop the checks everywhere in this function for the sake of
clarity.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <20210312092212.782255-2-groug@kaod.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Greg Kurz 2021-03-12 10:22:06 +01:00 committed by Michael S. Tsirkin
parent 0ab8c021c6
commit a890557d5a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/virtio/vhost-user.c
View File

@ -1420,7 +1420,7 @@ static void slave_read(void *opaque)
do {
size = recvmsg(u->slave_fd, &msgh, 0);
} while (size < 0 && (errno == EINTR || errno == EAGAIN));
} while (size < 0 && errno == EINTR);
if (size != VHOST_USER_HDR_SIZE) {
error_report("Failed to read from slave.");
@ -1452,7 +1452,7 @@ static void slave_read(void *opaque)
/* Read payload */
do {
size = read(u->slave_fd, &payload, hdr.size);
} while (size < 0 && (errno == EINTR || errno == EAGAIN));
} while (size < 0 && errno == EINTR);
if (size != hdr.size) {
error_report("Failed to read payload from slave.");
@ -1503,7 +1503,7 @@ static void slave_read(void *opaque)
do {
size = writev(u->slave_fd, iovec, ARRAY_SIZE(iovec));
} while (size < 0 && (errno == EINTR || errno == EAGAIN));
} while (size < 0 && errno == EINTR);
if (size != VHOST_USER_HDR_SIZE + hdr.size) {
error_report("Failed to send msg reply to slave.");