X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Fprocess.h;h=dcfda204db8e671af68b9443664c1d42d8197a2f;hb=88523f27e8448fc45c531e58a53af49cce39e891;hp=8894360a24f34fa57b90a702c8674a89899e3998;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git

diff --git a/app/test/process.h b/app/test/process.h
index 8894360a24..dcfda204db 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -36,6 +36,14 @@
 
 #ifndef RTE_EXEC_ENV_BAREMETAL
 
+#ifdef RTE_EXEC_ENV_BSDAPP
+#define self "curproc"
+#define exe "file"
+#else
+#define self "self"
+#define exe "exe"
+#endif
+
 /*
  * launches a second copy of the test process using the given argv parameters,
  * which should include argv[0] as the process name. To identify in the
@@ -45,7 +53,12 @@
 static inline int
 process_dup(const char *const argv[], int numargs, const char *env_value)
 {
+	int num;
+#ifdef RTE_LIBRTE_XEN_DOM0
+	char *argv_cpy[numargs + 2];
+#else
 	char *argv_cpy[numargs + 1];
+#endif
 	int i, fd, status;
 	char path[32];
 
@@ -56,24 +69,31 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 		/* make a copy of the arguments to be passed to exec */
 		for (i = 0; i < numargs; i++)
 			argv_cpy[i] = strdup(argv[i]);
+	#ifdef RTE_LIBRTE_XEN_DOM0
+        	argv_cpy[i] = strdup("--xen-dom0");
+        	argv_cpy[i + 1] = NULL;
+		num = numargs + 1;
+	#else
 		argv_cpy[i] = NULL;
+		num = numargs;
+	#endif
 
 		/* close all open file descriptors, check /proc/self/fd to only
 		 * call close on open fds. Exclude fds 0, 1 and 2*/
 		for (fd = getdtablesize(); fd > 2; fd-- ) {
-			rte_snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+			rte_snprintf(path, sizeof(path), "/proc/" exe "/fd/%d", fd);
 			if (access(path, F_OK) == 0)
 				close(fd);
 		}
 		printf("Running binary with argv[]:");
-		for (i = 0; i < numargs; i++)
+		for (i = 0; i < num; i++)
 			printf("'%s' ", argv_cpy[i]);
 		printf("\n");
 
 		/* set the environment variable */
 		if (setenv(RECURSIVE_ENV_VAR, env_value, 1) != 0)
 			rte_panic("Cannot export environment variable\n");
-		if (execv("/proc/self/exe", argv_cpy) < 0)
+		if (execv("/proc/" self "/" exe, argv_cpy) < 0)
 			rte_panic("Cannot exec\n");
 	}
 	/* parent process does a wait */