X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fprocess.h;h=4f8d121162ef2f501299dcd8728be6b25407041d;hb=e45ae7065e92ade35d6a3883a986a4210c78cc24;hp=f896b04f57b5dccb4c55c618cbbab8829d9febb1;hpb=764bf26873b95761ac3bd4b98251d3c497c65a90;p=dpdk.git

diff --git a/app/test/process.h b/app/test/process.h
index f896b04f57..4f8d121162 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -34,8 +34,6 @@
 #ifndef _PROCESS_H_
 #define _PROCESS_H_
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
-
 #ifdef RTE_EXEC_ENV_BSDAPP
 #define self "curproc"
 #define exe "file"
@@ -53,7 +51,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];
 
@@ -64,17 +67,24 @@ 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/" exe "/fd/%d", fd);
+			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");
 
@@ -86,10 +96,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 	}
 	/* parent process does a wait */
 	while (wait(&status) != pid)
-			;
+		;
 	return status;
 }
 
-#endif /* not baremetal */
-
 #endif /* _PROCESS_H_ */