[PATCH] no-fork option for tapdisk2 debugging

[Philipp Hahn <hahn@univention.de>]

[-- Attachment #1.1.1: Type: text/plain, Size: 661 bytes --]

Hello,

For debugging tapdisk2 it would be nice if forking into the background could 
be disabled by passing some command line argument. The attached patch adds 
such an option (-n).
The second patch re-indents four un-changed lines.
It would be nice if this could be included into the source core repository.

Sincerely
Philipp Hahn
-- 
Philipp Hahn           Open Source Software Engineer      hahn@univention.de
Univention GmbH        Linux for Your Business        fon: +49 421 22 232- 0
Mary-Somerville-Str.1  D-28359 Bremen                 fax: +49 421 22 232-99
                                                   http://www.univention.de/

[-- Attachment #1.1.2: tapdisk2.diff --]
[-- Type: text/x-diff, Size: 1521 bytes --]

Add option to disable forking

To simplify running tapdisk2 from a debugger, add an opttion "-n" to disable foring into the background.

Signed-off-by: Philipp Hahn <hahn@univention.de>
--- xen-4.0.1.orig/tools/blktap2/drivers/tapdisk2.c	2010-08-25 12:22:07.000000000 +0200
+++ xen-4.0.1/tools/blktap2/drivers/tapdisk2.c	2011-06-17 17:37:35.000000000 +0200
@@ -402,7 +402,7 @@ tapdisk2_wait_for_device(void)
 static void
 usage(const char *app, int err)
 {
-	fprintf(stderr, "usage: %s <-n file>\n", app);
+	fprintf(stderr, "usage: %s [-f] -n driver:file\n", app);
 	exit(err);
 }
 
@@ -411,10 +411,11 @@ main(int argc, char *argv[])
 {
 	int c;
 	char *params;
+	int do_fork = 1;
 
 	params = NULL;
 
-	while ((c = getopt(argc, argv, "n:s:h")) != -1) {
+	while ((c = getopt(argc, argv, "n:s:fh")) != -1) {
 		switch (c) {
 		case 'n':
 			params = optarg;
@@ -430,6 +431,9 @@ main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 #endif
 			break;
+		case 'f':
+			do_fork = 0;
+			break;
 		default:
 			usage(argv[0], EINVAL);
 		}
@@ -438,12 +442,17 @@ main(int argc, char *argv[])
 	if (!params || optind != argc)
 		usage(argv[0], EINVAL);
 
+	if (do_fork) {
 	if (pipe(channel) == -1) {
 		printf("pipe failed: %d\n", errno);
 		return errno;
 	}
+	} else {
+		channel[0] = dup(STDIN_FILENO);
+		channel[1] = dup(STDERR_FILENO);
+	}
 
-	switch (fork()) {
+	switch (do_fork ? fork() : 0) {
 	case -1:
 		printf("fork failed: %d\n", errno);
 		return errno;

[-- Attachment #1.1.3: tapdisk2_indent.diff --]
[-- Type: text/x-diff, Size: 682 bytes --]

Re-indent lines.

Re-indent lines after applying patch to add no-fork option.

Signed-off-by: Philipp Hahn <hahn@univention.de>
--- xen-4.0.1.orig/tools/blktap2/drivers/tapdisk2.c	2010-08-25 12:22:07.000000000 +0200
+++ xen-4.0.1/tools/blktap2/drivers/tapdisk2.c	2011-06-17 17:37:35.000000000 +0200
@@ -443,10 +443,10 @@ main(int argc, char *argv[])
 		usage(argv[0], EINVAL);
 
 	if (do_fork) {
-	if (pipe(channel) == -1) {
-		printf("pipe failed: %d\n", errno);
-		return errno;
-	}
+		if (pipe(channel) == -1) {
+			printf("pipe failed: %d\n", errno);
+			return errno;
+		}
 	} else {
 		channel[0] = dup(STDIN_FILENO);
 		channel[1] = dup(STDERR_FILENO);

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel