d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xen: remove dependency in applications

Browse Source 
Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Jianfeng Tan 2017-09-14 02:40:26 +00:00 committed by Thomas Monjalon
parent 8b3746e8f7
commit a641f1f9d5
7 changed files with 0 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ip_pipeline/app.h
View File

@ -428,10 +428,6 @@ struct app_eal_params {
/* Interrupt mode for VFIO (legacy|msi|msix) */ /* Interrupt mode for VFIO (legacy|msi|msix) */
char *vfio_intr; char *vfio_intr;
/* Support running on Xen dom0 without hugetlbfs */
uint32_t xen_dom0_present;
int xen_dom0;
uint32_t parsed; uint32_t parsed;
}; };

19
examples/ip_pipeline/config_parse.c
View File

@ -809,21 +809,6 @@ parse_eal(struct app_params *app,
continue; continue;
} }
/* xen_dom0 */
if (strcmp(entry->name, "xen_dom0") == 0) {
int val;
PARSE_ERROR_DUPLICATE((p->xen_dom0_present == 0),
section_name,
entry->name);
p->xen_dom0_present = 1;
val = parser_read_arg_bool(entry->value);
PARSE_ERROR((val >= 0), section_name, entry->name);
p->xen_dom0 = val;
continue;
}
/* unrecognized */ /* unrecognized */
PARSE_ERROR_INVALID(0, section_name, entry->name); PARSE_ERROR_INVALID(0, section_name, entry->name);
} }
@ -2643,10 +2628,6 @@ save_eal_params(struct app_params *app, FILE *f)
if (p->vfio_intr) if (p->vfio_intr)
fprintf(f, "%s = %s\n", "vfio_intr", p->vfio_intr); fprintf(f, "%s = %s\n", "vfio_intr", p->vfio_intr);
if (p->xen_dom0_present)
fprintf(f, "%s = %s\n", "xen_dom0",
(p->xen_dom0) ? "yes" : "no");
fputc('\n', f); fputc('\n', f);
} }

5
examples/ip_pipeline/init.c
View File

@ -296,11 +296,6 @@ app_init_eal(struct app_params *app)
app->eal_argv[n_args++] = strdup(buffer); app->eal_argv[n_args++] = strdup(buffer);
} }
if ((p->xen_dom0_present) && (p->xen_dom0)) {
snprintf(buffer, sizeof(buffer), "--xen-dom0");
app->eal_argv[n_args++] = strdup(buffer);
}
snprintf(buffer, sizeof(buffer), "--"); snprintf(buffer, sizeof(buffer), "--");
app->eal_argv[n_args++] = strdup(buffer); app->eal_argv[n_args++] = strdup(buffer);

3
examples/kni/main.c
View File

@ -921,9 +921,6 @@ main(int argc, char** argv)
continue; continue;
kni_free_kni(port); kni_free_kni(port);
} }
#ifdef RTE_LIBRTE_XEN_DOM0
rte_kni_close();
#endif
for (i = 0; i < RTE_MAX_ETHPORTS; i++) for (i = 0; i < RTE_MAX_ETHPORTS; i++)
if (kni_port_params_array[i]) { if (kni_port_params_array[i]) {
rte_free(kni_port_params_array[i]); rte_free(kni_port_params_array[i]);

10
test/test/process.h
View File

@ -52,11 +52,7 @@ static inline int
process_dup(const char *const argv[], int numargs, const char *env_value) process_dup(const char *const argv[], int numargs, const char *env_value)
{ {
int num; int num;
#ifdef RTE_LIBRTE_XEN_DOM0
char *argv_cpy[numargs + 2];
#else
char *argv_cpy[numargs + 1]; char *argv_cpy[numargs + 1];
#endif
int i, fd, status; int i, fd, status;
char path[32]; char path[32];
@ -67,14 +63,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
/* make a copy of the arguments to be passed to exec */ /* make a copy of the arguments to be passed to exec */
for (i = 0; i < numargs; i++) for (i = 0; i < numargs; i++)
argv_cpy[i] = strdup(argv[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; argv_cpy[i] = NULL;
num = numargs; num = numargs;
#endif
/* close all open file descriptors, check /proc/self/fd to only /* close all open file descriptors, check /proc/self/fd to only
* call close on open fds. Exclude fds 0, 1 and 2*/ * call close on open fds. Exclude fds 0, 1 and 2*/

4
test/test/test.c
View File

@ -87,11 +87,7 @@ do_recursive_call(void)
{ "test_invalid_b_flag", no_action }, { "test_invalid_b_flag", no_action },
{ "test_invalid_vdev_flag", no_action }, { "test_invalid_vdev_flag", no_action },
{ "test_invalid_r_flag", no_action }, { "test_invalid_r_flag", no_action },
#ifdef RTE_LIBRTE_XEN_DOM0
{ "test_dom0_misc_flags", no_action },
#else
{ "test_misc_flags", no_action }, { "test_misc_flags", no_action },
#endif
{ "test_memory_flags", no_action }, { "test_memory_flags", no_action },
{ "test_file_prefix", no_action }, { "test_file_prefix", no_action },
{ "test_no_huge_flag", no_action }, { "test_no_huge_flag", no_action },

81
test/test/test_eal_flags.c
View File

@ -51,11 +51,7 @@
#include "process.h" #include "process.h"
#ifdef RTE_LIBRTE_XEN_DOM0
#define DEFAULT_MEM_SIZE "30"
#else
#define DEFAULT_MEM_SIZE "18" #define DEFAULT_MEM_SIZE "18"
#endif
#define mp_flag "--proc-type=secondary" #define mp_flag "--proc-type=secondary"
#define no_hpet "--no-hpet" #define no_hpet "--no-hpet"
#define no_huge "--no-huge" #define no_huge "--no-huge"
@ -809,72 +805,6 @@ test_no_huge_flag(void)
return 0; return 0;
} }
#ifdef RTE_LIBRTE_XEN_DOM0
static int
test_dom0_misc_flags(void)
{
char prefix[PATH_MAX], tmp[PATH_MAX];
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
/* check that some general flags don't prevent things from working.
* All cases, apart from the first, app should run.
* No further testing of output done.
*/
/* sanity check - failure with invalid option */
const char *argv0[] = {prgname, prefix, mp_flag, "-c", "1", "--invalid-opt"};
/* With --no-pci */
const char *argv1[] = {prgname, prefix, mp_flag, "-c", "1", "--no-pci"};
/* With -v */
const char *argv2[] = {prgname, prefix, mp_flag, "-c", "1", "-v"};
/* With valid --syslog */
const char *argv3[] = {prgname, prefix, mp_flag, "-c", "1",
"--syslog", "syslog"};
/* With empty --syslog (should fail) */
const char *argv4[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog"};
/* With invalid --syslog */
const char *argv5[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog", "error"};
/* With no-sh-conf */
const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", "20",
"--no-shconf", "--file-prefix=noshconf" };
if (launch_proc(argv0) == 0) {
printf("Error - process ran ok with invalid flag\n");
return -1;
}
if (launch_proc(argv1) != 0) {
printf("Error - process did not run ok with --no-pci flag\n");
return -1;
}
if (launch_proc(argv2) != 0) {
printf("Error - process did not run ok with -v flag\n");
return -1;
}
if (launch_proc(argv3) != 0) {
printf("Error - process did not run ok with --syslog flag\n");
return -1;
}
if (launch_proc(argv4) == 0) {
printf("Error - process run ok with empty --syslog flag\n");
return -1;
}
if (launch_proc(argv5) == 0) {
printf("Error - process run ok with invalid --syslog flag\n");
return -1;
}
if (launch_proc(argv6) != 0) {
printf("Error - process did not run ok with --no-shconf flag\n");
return -1;
}
return 0;
}
#else
static int static int
test_misc_flags(void) test_misc_flags(void)
{ {
@ -1061,7 +991,6 @@ test_misc_flags(void)
} }
return 0; return 0;
} }
#endif
static int static int
test_file_prefix(void) test_file_prefix(void)
@ -1098,9 +1027,6 @@ test_file_prefix(void)
printf("Error - unable to get current prefix!\n"); printf("Error - unable to get current prefix!\n");
return -1; return -1;
} }
#ifdef RTE_LIBRTE_XEN_DOM0
return 0;
#endif
/* check if files for current prefix are present */ /* check if files for current prefix are present */
if (process_hugefiles(prefix, HUGEPAGE_CHECK_EXISTS) != 1) { if (process_hugefiles(prefix, HUGEPAGE_CHECK_EXISTS) != 1) {
@ -1299,9 +1225,6 @@ test_memory_flags(void)
printf("Error - process failed with valid -m flag!\n"); printf("Error - process failed with valid -m flag!\n");
return -1; return -1;
} }
#ifdef RTE_LIBRTE_XEN_DOM0
return 0;
#endif
if (launch_proc(argv2) == 0) { if (launch_proc(argv2) == 0) {
printf("Error - process run ok with invalid (zero) --socket-mem!\n"); printf("Error - process run ok with invalid (zero) --socket-mem!\n");
return -1; return -1;
@ -1427,11 +1350,7 @@ test_eal_flags(void)
return ret; return ret;
} }
#ifdef RTE_LIBRTE_XEN_DOM0
ret = test_dom0_misc_flags();
#else
ret = test_misc_flags(); ret = test_misc_flags();
#endif
if (ret < 0) { if (ret < 0) {
printf("Error in test_misc_flags()"); printf("Error in test_misc_flags()");
return ret; return ret;