summaryrefslogtreecommitdiff
path: root/examples/vmdq
diff options
context:
space:
mode:
authorDavid Marchand <david.marchand@6wind.com>2014-09-26 16:04:02 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-11-27 13:09:59 +0100
commit98a1648109b8dbaa4e6b821c17d1f6bd86d33a9a (patch)
treec55ee2a18dac541731bde2d9f7fa33c0d5275c3f /examples/vmdq
parent503f9e8b42562b923e73e908be6ba69964f1f1e7 (diff)
downloaddpdk-98a1648109b8dbaa4e6b821c17d1f6bd86d33a9a.zip
dpdk-98a1648109b8dbaa4e6b821c17d1f6bd86d33a9a.tar.gz
dpdk-98a1648109b8dbaa4e6b821c17d1f6bd86d33a9a.tar.xz
examples: no more bare metal environment
Signed-off-by: David Marchand <david.marchand@6wind.com> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com> Acked-by: Neil Horman <nhorman@tuxdriver.com>
Diffstat (limited to 'examples/vmdq')
-rw-r--r--examples/vmdq/main.c8
-rw-r--r--examples/vmdq/main.h46
2 files changed, 1 insertions, 53 deletions
diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index e60b671..2c6a649 100644
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -70,8 +70,6 @@
#include <rte_mbuf.h>
#include <rte_memcpy.h>
-#include "main.h"
-
#define MAX_QUEUES 128
/*
* For 10 GbE, 128 queues require roughly
@@ -443,7 +441,6 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port)
ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
}
-#ifndef RTE_EXEC_ENV_BAREMETAL
/* When we receive a HUP signal, print out our stats */
static void
sighup_handler(int signum)
@@ -456,7 +453,6 @@ sighup_handler(int signum)
}
printf("\nFinished handling signal %d\n", signum);
}
-#endif
/*
* Main thread that does the work, reading from INPUT_PORT
@@ -574,7 +570,7 @@ static unsigned check_ports_num(unsigned nb_ports)
/* Main function, does initialisation and calls the per-lcore functions */
int
-MAIN(int argc, char *argv[])
+main(int argc, char *argv[])
{
struct rte_mempool *mbuf_pool;
unsigned lcore_id, core_id = 0;
@@ -582,9 +578,7 @@ MAIN(int argc, char *argv[])
unsigned nb_ports, valid_num_ports;
uint8_t portid;
-#ifndef RTE_EXEC_ENV_BAREMETAL
signal(SIGHUP, sighup_handler);
-#endif
/* init EAL */
ret = rte_eal_init(argc, argv);
diff --git a/examples/vmdq/main.h b/examples/vmdq/main.h
deleted file mode 100644
index f13c9aa..0000000
--- a/examples/vmdq/main.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * 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
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * 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
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _MAIN_H_
-#define _MAIN_H_
-
-
-#ifdef RTE_EXEC_ENV_BAREMETAL
-#define MAIN _main
-#else
-#define MAIN main
-#endif
-
-int MAIN( int argc, char *argv[] );
-
-#endif /* ifndef _MAIN_H_ */