motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 23:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtiofsd: add --fd=FDNUM fd passing option

Browse source 
Although --socket-path=PATH is useful for manual invocations, management
tools typically create the UNIX domain socket themselves and pass it to
the vhost-user device backend.  This way QEMU can be launched
immediately with a valid socket.  No waiting for the vhost-user device
backend is required when fd passing is used.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2019-06-25 17:18:00 +01:00 • committed by Dr. David Alan Gilbert
parent eb49d187ef
commit cee8e35d43
3 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tools/virtiofsd/fuse_virtio.c
View file

@ -638,18 +638,21 @@ int virtio_loop(struct fuse_session *se)
return 0;
}
int virtio_session_mount(struct fuse_session *se)
static int fv_create_listen_socket(struct fuse_session *se)
{
struct sockaddr_un un;
mode_t old_umask;
/* Nothing to do if fd is already initialized */
if (se->vu_listen_fd >= 0) {
return 0;
}
if (strlen(se->vu_socket_path) >= sizeof(un.sun_path)) {
fuse_log(FUSE_LOG_ERR, "Socket path too long\n");
return -1;
}
se->fd = -1;
/*
* Create the Unix socket to communicate with qemu
* based on QEMU's vhost-user-bridge
@ -682,15 +685,31 @@ int virtio_session_mount(struct fuse_session *se)
return -1;
}
se->vu_listen_fd = listen_sock;
return 0;
}
int virtio_session_mount(struct fuse_session *se)
{
int ret;
ret = fv_create_listen_socket(se);
if (ret < 0) {
return ret;
}
se->fd = -1;
fuse_log(FUSE_LOG_INFO, "%s: Waiting for vhost-user socket connection...\n",
__func__);
int data_sock = accept(listen_sock, NULL, NULL);
int data_sock = accept(se->vu_listen_fd, NULL, NULL);
if (data_sock == -1) {
fuse_log(FUSE_LOG_ERR, "vhost socket accept: %m\n");
close(listen_sock);
close(se->vu_listen_fd);
return -1;
}
close(listen_sock);
close(se->vu_listen_fd);
se->vu_listen_fd = -1;
fuse_log(FUSE_LOG_INFO, "%s: Received vhost-user socket connection\n",
__func__);