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

hw: replace qemu_set_nonblock()

Browse Source 
Those calls are non-socket fd, or are POSIX-specific. Use the dedicated
GLib API. (qemu_set_nonblock() is for socket-like)

(this is a preliminary patch before renaming qemu_set_nonblock())

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-04-25 17:39:06 +04:00
parent b0a8f9adfe
commit 701544cfaf
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/input/virtio-input-host.c
View File

@ -114,7 +114,10 @@ static void virtio_input_host_realize(DeviceState *dev, Error **errp)
error_setg_file_open(errp, errno, vih->evdev); error_setg_file_open(errp, errno, vih->evdev);
return; return;
} }
qemu_set_nonblock(vih->fd); if (!g_unix_set_fd_nonblocking(vih->fd, true, NULL)) {
error_setg_errno(errp, errno, "Failed to set FD nonblocking");
goto err_close;
}
rc = ioctl(vih->fd, EVIOCGVERSION, &ver); rc = ioctl(vih->fd, EVIOCGVERSION, &ver);
if (rc < 0) { if (rc < 0) {

11
hw/virtio/vhost-vsock.c
View File

@ -149,9 +149,8 @@ static void vhost_vsock_device_realize(DeviceState *dev, Error **errp)
return; return;
} }
ret = qemu_try_set_nonblock(vhostfd); if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {
if (ret < 0) { error_setg_errno(errp, errno,
error_setg_errno(errp, -ret,
"vhost-vsock: unable to set non-blocking mode"); "vhost-vsock: unable to set non-blocking mode");
return; return;
} }
@ -163,7 +162,11 @@ static void vhost_vsock_device_realize(DeviceState *dev, Error **errp)
return; return;
} }
qemu_set_nonblock(vhostfd); if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {
error_setg_errno(errp, errno,
"Failed to set FD nonblocking");
return;
}
} }
vhost_vsock_common_realize(vdev, "vhost-vsock"); vhost_vsock_common_realize(vdev, "vhost-vsock");