mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
error handling: Use RETRY_ON_EINTR() macro where applicable
There is a defined RETRY_ON_EINTR() macro in qemu/osdep.h which handles the same while loop. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/415 Signed-off-by: Nikita Ivanov <nivanov@cloudlinux.com> Message-Id: <20221023090422.242617-3-nivanov@cloudlinux.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> [thuth: Dropped the hunk that changed socket_accept() in libqtest.c] Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
8b6aa69365
commit
37b0b24e93
13 changed files with 45 additions and 81 deletions
|
@ -102,9 +102,7 @@ static ssize_t tap_write_packet(TAPState *s, const struct iovec *iov, int iovcnt
|
|||
{
|
||||
ssize_t len;
|
||||
|
||||
do {
|
||||
len = writev(s->fd, iov, iovcnt);
|
||||
} while (len == -1 && errno == EINTR);
|
||||
len = RETRY_ON_EINTR(writev(s->fd, iov, iovcnt));
|
||||
|
||||
if (len == -1 && errno == EAGAIN) {
|
||||
tap_write_poll(s, true);
|
||||
|
@ -577,9 +575,7 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
|
|||
|
||||
close(sv[1]);
|
||||
|
||||
do {
|
||||
fd = recv_fd(sv[0]);
|
||||
} while (fd == -1 && errno == EINTR);
|
||||
fd = RETRY_ON_EINTR(recv_fd(sv[0]));
|
||||
saved_errno = errno;
|
||||
|
||||
close(sv[0]);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue