[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/16] qemu-nbd: print error messages from the daemo
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 09/16] qemu-nbd: print error messages from the daemon through a pipe |
Date: |
Fri, 11 Nov 2011 18:39:21 +0100 |
From: Paolo Bonzini <address@hidden>
In order to get nice error messages, keep the qemu-nbd process running
until before issuing NBD_DO_IT and connected to the daemon with a pipe.
This lets the qemu-nbd process relay error messages from the daemon and
exit with a nonzero status if appropriate.
Suggested-by: Kevin Wolf <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-nbd.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index ffc2a8a..b330d8d 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -226,8 +226,13 @@ static void *nbd_client_thread(void *arg)
/* update partition table */
pthread_create(&show_parts_thread, NULL, show_parts, NULL);
- fprintf(stderr, "NBD device %s is now connected to %s\n",
- device, srcpath);
+ if (verbose) {
+ fprintf(stderr, "NBD device %s is now connected to %s\n",
+ device, srcpath);
+ } else {
+ /* Close stderr so that the qemu-nbd process exits. */
+ dup2(STDOUT_FILENO, STDERR_FILENO);
+ }
ret = nbd_client(fd);
if (ret) {
@@ -406,6 +411,58 @@ int main(int argc, char **argv)
return 0;
}
+ if (device && !verbose) {
+ int stderr_fd[2];
+ pid_t pid;
+ int ret;
+
+ if (qemu_pipe(stderr_fd) == -1) {
+ err(EXIT_FAILURE, "Error setting up communication pipe");
+ }
+
+ /* Now daemonize, but keep a communication channel open to
+ * print errors and exit with the proper status code.
+ */
+ pid = fork();
+ if (pid == 0) {
+ close(stderr_fd[0]);
+ ret = qemu_daemon(0, 0);
+
+ /* Temporarily redirect stderr to the parent's pipe... */
+ dup2(stderr_fd[1], STDERR_FILENO);
+ if (ret == -1) {
+ err(EXIT_FAILURE, "Failed to daemonize");
+ }
+
+ /* ... close the descriptor we inherited and go on. */
+ close(stderr_fd[1]);
+ } else {
+ bool errors = false;
+ char *buf;
+
+ /* In the parent. Print error messages from the child until
+ * it closes the pipe.
+ */
+ close(stderr_fd[1]);
+ buf = g_malloc(1024);
+ while ((ret = read(stderr_fd[0], buf, 1024)) > 0) {
+ errors = true;
+ ret = qemu_write_full(STDERR_FILENO, buf, ret);
+ if (ret == -1) {
+ exit(EXIT_FAILURE);
+ }
+ }
+ if (ret == -1) {
+ err(EXIT_FAILURE, "Cannot read from daemon");
+ }
+
+ /* Usually the daemon should not print any message.
+ * Exit with zero status in that case.
+ */
+ exit(errors);
+ }
+ }
+
bdrv_init();
bs = bdrv_new("hda");
@@ -433,13 +490,6 @@ int main(int argc, char **argv)
err(EXIT_FAILURE, "Failed to open %s", device);
}
- if (!verbose) {
- /* detach client and server */
- if (qemu_daemon(0, 0) == -1) {
- err(EXIT_FAILURE, "Failed to daemonize");
- }
- }
-
if (sockpath == NULL) {
sockpath = g_malloc(128);
snprintf(sockpath, 128, SOCKET_PATH, basename(device));
--
1.7.6.4
- [Qemu-devel] [PULL 00/16] Block patches for 1.0, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 01/16] vvfat: Fix read-write mode, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 02/16] block: add eject request callback, Kevin Wolf, 2011/11/11
- [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 <=
- [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, 2011/11/11
- [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