remove trailing whitespaces

[dpdk.git] / app / test / test_eal_flags.c

diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 9bab1a5..298c11a 100644 (file)
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -1,14 +1,14 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   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
@@ -18,7 +18,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
@@ -57,7 +57,8 @@
 #define no_hpet "--no-hpet"
 #define no_huge "--no-huge"
 #define no_shconf "--no-shconf"
-#define use_device "--use-device"
+#define pci_whitelist "--pci-whitelist"
+#define vdev "--vdev"
 #define memtest "memtest"
 #define memtest1 "memtest1"
 #define memtest2 "memtest2"
@@ -161,7 +162,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action)
 
                                        rte_snprintf(file_path, sizeof(file_path),
                                                "%s/%s", hugedir, dirent->d_name);
-                                       
+
                                        /* remove file */
                                        if (remove(file_path) < 0) {
                                                printf("Error deleting %s - %s!\n",
@@ -295,26 +296,30 @@ test_whitelist_flag(void)
 
        const char *wlinval[][11] = {
                {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                               use_device, "error", "", ""},
+                               pci_whitelist, "error", "", ""},
                {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                               use_device, "0:0:0", "", ""},
+                               pci_whitelist, "0:0:0", "", ""},
                {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                               use_device, "0:error:0.1", "", ""},
+                               pci_whitelist, "0:error:0.1", "", ""},
                {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                               use_device, "0:0:0.1error", "", ""},
+                               pci_whitelist, "0:0:0.1error", "", ""},
                {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                               use_device, "error0:0:0.1", "", ""},
+                               pci_whitelist, "error0:0:0.1", "", ""},
                {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                               use_device, "0:0:0.1.2", "", ""},
+                               pci_whitelist, "0:0:0.1.2", "", ""},
        };
        /* Test with valid whitelist option */
        const char *wlval1[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                       use_device, "00FF:09:0B.3"};
+                       pci_whitelist, "00FF:09:0B.3"};
        const char *wlval2[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                       use_device, "09:0B.3", use_device, "0a:0b.1"};
+                       pci_whitelist, "09:0B.3", pci_whitelist, "0a:0b.1"};
        const char *wlval3[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
-                       use_device, "09:0B.3;type=test",
-                       use_device, "08:00.1;type=normal"};
+                       pci_whitelist, "09:0B.3,type=test",
+                       pci_whitelist, "08:00.1,type=normal",
+#ifdef CONFIG_RTE_LIBRTE_PMD_RING
+                       vdev, "eth_ring,arg=test",
+#endif
+       };
 
        for (i = 0; i < sizeof(wlinval) / sizeof(wlinval[0]); i++) {
                if (launch_proc(wlinval[i]) == 0) {
@@ -663,7 +668,7 @@ test_dom0_misc_flags(void)
                printf("Error - process did not run ok with --no-shconf flag\n");
                return -1;
        }
-       
+
        return 0;
 }
 #else