[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/16] qemu-nbd: fix socket creation race
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/16] qemu-nbd: fix socket creation race |
Date: |
Fri, 11 Nov 2011 18:39:22 +0100 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-nbd.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index b330d8d..6f84ad0 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -205,10 +205,7 @@ static void *nbd_client_thread(void *arg)
do {
sock = unix_socket_outgoing(sockpath);
if (sock == -1) {
- if (errno != ENOENT && errno != ECONNREFUSED) {
- goto out;
- }
- sleep(1); /* wait parent */
+ goto out;
}
} while (sock == -1);
@@ -480,8 +477,6 @@ int main(int argc, char **argv)
err(EXIT_FAILURE, "Could not find partition %d", partition);
if (device) {
- int ret;
-
/* Open before spawning new threads. In the future, we may
* drop privileges after opening.
*/
@@ -494,15 +489,6 @@ int main(int argc, char **argv)
sockpath = g_malloc(128);
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));
@@ -515,6 +501,20 @@ int main(int argc, char **argv)
if (sharing_fds[0] == -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];
nb_fds++;
--
1.7.6.4
- [Qemu-devel] [PATCH 03/16] atapi: implement eject requests, (continued)
- [Qemu-devel] [PATCH 03/16] atapi: implement eject requests, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 04/16] scsi-disk: implement eject requests, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 05/16] nbd: treat EPIPE from NBD_DO_IT as success, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 07/16] qemu-nbd: rename socket variable, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 09/16] qemu-nbd: print error messages from the daemon through a pipe, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 08/16] qemu-nbd: move client to a thread, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 11/16] qemu-nbd: open the block device after starting the client thread, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 15/16] block: Introduce bdrv_co_flush_to_os, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 14/16] block: Rename bdrv_co_flush to bdrv_co_flush_to_disk, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 16/16] block: Make cache=unsafe flush to the OS, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 10/16] qemu-nbd: fix socket creation race,
Kevin Wolf <=
- [Qemu-devel] [PATCH 12/16] block: Fix vpc initialization of the Dynamic Disk Header, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 06/16] qemu-nbd: trap SIGTERM, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 13/16] hw/pc.c: Fix use-while-uninitialized of fd_type[], Kevin Wolf, 2011/11/11
- Re: [Qemu-devel] [PULL 00/16] Block patches for 1.0, Anthony Liguori, 2011/11/13