motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-11 16:00:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

qemu-nbd: fix socket creation race

Browse source 
Now that the client and server are in the same process, there is
no need to race on the creation of the socket.  We can open the
listening socket before starting the client thread.

This avoids that "qemu-nbd -v -c" prints this once before connecting
successfully to the socket:

    connect(unix:/var/lock/qemu-nbd-nbd0): No such file or directory

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-11-04 15:51:23 +01:00 • committed by Kevin Wolf
parent c1f8fdc362
commit f1ef5555c2
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
qemu-nbd.c
View file

@ -205,10 +205,7 @@ static void *nbd_client_thread(void *arg)
do { do {
sock = unix_socket_outgoing(sockpath); sock = unix_socket_outgoing(sockpath);
if (sock == -1) { if (sock == -1) {
if (errno != ENOENT && errno != ECONNREFUSED) { goto out;
goto out;
}
sleep(1); /* wait parent */
} }
} while (sock == -1); } while (sock == -1);
@ -480,8 +477,6 @@ int main(int argc, char **argv)
err(EXIT_FAILURE, "Could not find partition %d", partition); err(EXIT_FAILURE, "Could not find partition %d", partition);
if (device) { if (device) {
int ret;
/* Open before spawning new threads. In the future, we may /* Open before spawning new threads. In the future, we may
* drop privileges after opening. * drop privileges after opening.
*/ */
@ -494,15 +489,6 @@ int main(int argc, char **argv)
sockpath = g_malloc(128); sockpath = g_malloc(128);
snprintf(sockpath, 128, SOCKET_PATH, basename(device)); snprintf(sockpath, 128, SOCKET_PATH, basename(device));
} }
ret = pthread_create(&client_thread, NULL, nbd_client_thread, &fd);
if (ret != 0) {
errx(EXIT_FAILURE, "Failed to create client thread: %s",
strerror(ret));
}
} else {
/* Shut up GCC warnings. */
memset(&client_thread, 0, sizeof(client_thread));
} }
sharing_fds = g_malloc((shared + 1) * sizeof(int)); sharing_fds = g_malloc((shared + 1) * sizeof(int));
@ -515,6 +501,20 @@ int main(int argc, char **argv)
if (sharing_fds[0] == -1) if (sharing_fds[0] == -1)
return 1; return 1;
if (device) {
int ret;
ret = pthread_create(&client_thread, NULL, nbd_client_thread, &fd);
if (ret != 0) {
errx(EXIT_FAILURE, "Failed to create client thread: %s",
strerror(ret));
}
} else {
/* Shut up GCC warnings. */
memset(&client_thread, 0, sizeof(client_thread));
}
max_fd = sharing_fds[0]; max_fd = sharing_fds[0];
nb_fds++; nb_fds++;