Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/603/?format=api
{ "id": 603, "url": "http://patches.dpdk.org/api/patches/603/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1411740242-4240-6-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1411740242-4240-6-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1411740242-4240-6-git-send-email-thomas.monjalon@6wind.com", "date": "2014-09-26T14:04:02", "name": "[dpdk-dev,5/5] examples: no more bare metal environment", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7553ed7fd03af50c35452ef0a2f6178dd18d5d25", "submitter": { "id": 1, "url": "http://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1411740242-4240-6-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/603/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/603/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id B58F37E2B;\n\tFri, 26 Sep 2014 15:58:16 +0200 (CEST)", "from mail-wg0-f52.google.com (mail-wg0-f52.google.com\n\t[74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 7FCB77E1B\n\tfor <dev@dpdk.org>; Fri, 26 Sep 2014 15:58:12 +0200 (CEST)", "by mail-wg0-f52.google.com with SMTP id n12so7924169wgh.11\n\tfor <dev@dpdk.org>; Fri, 26 Sep 2014 07:04:35 -0700 (PDT)", "from localhost.localdomain (136-92-190-109.dsl.ovh.fr.\n\t[109.190.92.136]) by mx.google.com with ESMTPSA id\n\tfs13sm1246085wic.19.2014.09.26.07.04.32 for <multiple recipients>\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 26 Sep 2014 07:04:34 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=tFafPixoj9hG4BoFfR0WgUloQHiGxubGboszXtqW+i4=;\n\tb=BWHme7GSVcjfn9RvLV74UHIbJp+SPZ6f15A6/BitpRrKxyaWJwhaJKEsEMrABzKBqe\n\tvUYY92xzq81YzzavuXOCfGB1qgSGAScz9XQRYjmAEXJsWueQw+tI9ooVCGsk5nBKfDXa\n\tAUgBzmRHBAoGYeVFunZ8hLlVozeFKo04Z9uZ+0leKSIFfJ076jG1dhFt+lXSDpRdZp+q\n\tTdrjsZ6XXKPilb8rtwCn8yokL89XTsgSxlIKGURSdAG32QGze+bAI/wmELKOLs8a0obR\n\t3QiXkPh2or24v2NRdRmXo0ui/8ELfwNuvgQ+T0h1s2am2sYNqvCcAA7rE4mEZfSO3Xfq\n\tgjJw==", "X-Gm-Message-State": "ALoCoQlom2KLGLlHus0yc1reh5I4FWoR9AwtlHk+3xDFtDulMZ8CrTHHn3oKiXR2dnOvRl0azde6", "X-Received": "by 10.194.143.69 with SMTP id sc5mr23618515wjb.26.1411740274948; \n\tFri, 26 Sep 2014 07:04:34 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "dev@dpdk.org", "Date": "Fri, 26 Sep 2014 16:04:02 +0200", "Message-Id": "<1411740242-4240-6-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.0.4", "In-Reply-To": "<1411740242-4240-1-git-send-email-thomas.monjalon@6wind.com>", "References": "<1411740242-4240-1-git-send-email-thomas.monjalon@6wind.com>", "Subject": "[dpdk-dev] [PATCH 5/5] examples: no more bare metal environment", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: David Marchand <david.marchand@6wind.com>\n\nSigned-off-by: David Marchand <david.marchand@6wind.com>\n---\n examples/cmdline/main.c | 3 +-\n examples/cmdline/main.h | 45 ---------------------\n examples/dpdk_qat/main.c | 3 +-\n examples/dpdk_qat/main.h | 45 ---------------------\n examples/helloworld/main.c | 4 +-\n examples/helloworld/main.h | 45 ---------------------\n examples/ip_fragmentation/main.c | 4 +-\n examples/ip_fragmentation/main.h | 46 ----------------------\n examples/ip_pipeline/main.c | 2 +-\n examples/ip_pipeline/main.h | 8 ----\n examples/ip_reassembly/main.c | 4 +-\n examples/ip_reassembly/main.h | 46 ----------------------\n examples/ipv4_multicast/main.c | 4 +-\n examples/ipv4_multicast/main.h | 46 ----------------------\n examples/l2fwd/main.c | 4 +-\n examples/l2fwd/main.h | 45 ---------------------\n examples/l3fwd-acl/main.c | 4 +-\n examples/l3fwd-acl/main.h | 45 ---------------------\n examples/l3fwd-power/main.c | 4 +-\n examples/l3fwd-power/main.h | 45 ---------------------\n examples/l3fwd-vf/main.c | 4 +-\n examples/l3fwd-vf/main.h | 45 ---------------------\n examples/l3fwd/main.c | 4 +-\n examples/l3fwd/main.h | 41 -------------------\n examples/link_status_interrupt/main.c | 4 +-\n examples/link_status_interrupt/main.h | 45 ---------------------\n examples/load_balancer/main.c | 2 +-\n examples/load_balancer/main.h | 8 ----\n .../client_server_mp/mp_server/init.c | 1 -\n .../client_server_mp/mp_server/main.c | 3 +-\n .../client_server_mp/mp_server/main.h | 45 ---------------------\n examples/multi_process/l2fwd_fork/main.c | 3 +-\n examples/multi_process/l2fwd_fork/main.h | 45 ---------------------\n examples/qos_meter/main.c | 2 +-\n examples/qos_meter/main.h | 9 -----\n examples/qos_sched/main.c | 2 +-\n examples/qos_sched/main.h | 7 ----\n examples/quota_watermark/qw/main.c | 2 +-\n examples/quota_watermark/qw/main.h | 9 -----\n examples/quota_watermark/qwctl/qwctl.c | 2 +-\n examples/quota_watermark/qwctl/qwctl.h | 8 ----\n examples/timer/main.c | 4 +-\n examples/timer/main.h | 45 ---------------------\n examples/vhost/main.c | 6 +--\n examples/vhost/main.h | 7 ----\n examples/vhost_xen/main.c | 2 +-\n examples/vhost_xen/main.h | 8 ----\n examples/vmdq/main.c | 8 +---\n examples/vmdq/main.h | 46 ----------------------\n examples/vmdq_dcb/main.c | 8 +---\n examples/vmdq_dcb/main.h | 46 ----------------------\n 51 files changed, 27 insertions(+), 896 deletions(-)\n delete mode 100644 examples/cmdline/main.h\n delete mode 100644 examples/dpdk_qat/main.h\n delete mode 100644 examples/helloworld/main.h\n delete mode 100644 examples/ip_fragmentation/main.h\n delete mode 100644 examples/ip_reassembly/main.h\n delete mode 100644 examples/ipv4_multicast/main.h\n delete mode 100644 examples/l2fwd/main.h\n delete mode 100644 examples/l3fwd-acl/main.h\n delete mode 100644 examples/l3fwd-power/main.h\n delete mode 100644 examples/l3fwd-vf/main.h\n delete mode 100644 examples/l3fwd/main.h\n delete mode 100644 examples/link_status_interrupt/main.h\n delete mode 100644 examples/multi_process/client_server_mp/mp_server/main.h\n delete mode 100644 examples/multi_process/l2fwd_fork/main.h\n delete mode 100644 examples/timer/main.h\n delete mode 100644 examples/vmdq/main.h\n delete mode 100644 examples/vmdq_dcb/main.h", "diff": "diff --git a/examples/cmdline/main.c b/examples/cmdline/main.c\nindex 668f152..f8ee0a5 100644\n--- a/examples/cmdline/main.c\n+++ b/examples/cmdline/main.c\n@@ -77,9 +77,8 @@\n #include <rte_debug.h>\n \n #include \"commands.h\"\n-#include \"main.h\"\n \n-int MAIN(int argc, char **argv)\n+int main(int argc, char **argv)\n {\n \tint ret;\n \tstruct cmdline *cl;\ndiff --git a/examples/cmdline/main.h b/examples/cmdline/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/cmdline/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c\nindex c130ea3..d487650 100644\n--- a/examples/dpdk_qat/main.c\n+++ b/examples/dpdk_qat/main.c\n@@ -69,7 +69,6 @@\n #include <rte_ip.h>\n #include <rte_string_fns.h>\n \n-#include \"main.h\"\n #include \"crypto.h\"\n \n #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)\n@@ -672,7 +671,7 @@ init_mem(void)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tstruct rte_eth_link link;\ndiff --git a/examples/dpdk_qat/main.h b/examples/dpdk_qat/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/dpdk_qat/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/helloworld/main.c b/examples/helloworld/main.c\nindex 0c0f833..a4bbd11 100644\n--- a/examples/helloworld/main.c\n+++ b/examples/helloworld/main.c\n@@ -46,8 +46,6 @@\n #include <rte_lcore.h>\n #include <rte_debug.h>\n \n-#include \"main.h\"\n-\n static int\n lcore_hello(__attribute__((unused)) void *arg)\n {\n@@ -58,7 +56,7 @@ lcore_hello(__attribute__((unused)) void *arg)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tint ret;\n \tunsigned lcore_id;\ndiff --git a/examples/helloworld/main.h b/examples/helloworld/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/helloworld/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c\nindex 75028ac..46cc664 100644\n--- a/examples/ip_fragmentation/main.c\n+++ b/examples/ip_fragmentation/main.c\n@@ -75,8 +75,6 @@\n \n #include <rte_ip_frag.h>\n \n-#include \"main.h\"\n-\n #define RTE_LOGTYPE_IP_FRAG RTE_LOGTYPE_USER1\n \n #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)\n@@ -848,7 +846,7 @@ init_mem(void)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rx_queue *rxq;\ndiff --git a/examples/ip_fragmentation/main.h b/examples/ip_fragmentation/main.h\ndeleted file mode 100644\nindex f8c8415..0000000\n--- a/examples/ip_fragmentation/main.h\n+++ /dev/null\n@@ -1,46 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/ip_pipeline/main.c b/examples/ip_pipeline/main.c\nindex e19412f..2c53877 100644\n--- a/examples/ip_pipeline/main.c\n+++ b/examples/ip_pipeline/main.c\n@@ -76,7 +76,7 @@\n #include \"main.h\"\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tint ret;\n \ndiff --git a/examples/ip_pipeline/main.h b/examples/ip_pipeline/main.h\nindex 4bce203..6085aaa 100644\n--- a/examples/ip_pipeline/main.h\n+++ b/examples/ip_pipeline/main.h\n@@ -295,12 +295,4 @@ struct app_msg_resp {\n \n #define APP_FLUSH 0xFF\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n #endif /* _MAIN_H_ */\ndiff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c\nindex 9ba3f0a..32f7d98 100644\n--- a/examples/ip_reassembly/main.c\n+++ b/examples/ip_reassembly/main.c\n@@ -79,8 +79,6 @@\n \n #include <rte_ip_frag.h>\n \n-#include \"main.h\"\n-\n #define MAX_PKT_BURST 32\n \n \n@@ -1055,7 +1053,7 @@ signal_handler(int signum)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rx_queue *rxq;\ndiff --git a/examples/ip_reassembly/main.h b/examples/ip_reassembly/main.h\ndeleted file mode 100644\nindex f8c8415..0000000\n--- a/examples/ip_reassembly/main.h\n+++ /dev/null\n@@ -1,46 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c\nindex 5c2ab86..21ff7c6 100644\n--- a/examples/ipv4_multicast/main.c\n+++ b/examples/ipv4_multicast/main.c\n@@ -71,8 +71,6 @@\n #include <rte_fbk_hash.h>\n #include <rte_ip.h>\n \n-#include \"main.h\"\n-\n #define RTE_LOGTYPE_IPv4_MULTICAST RTE_LOGTYPE_USER1\n \n #define MAX_PORTS 16\n@@ -710,7 +708,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tint ret;\ndiff --git a/examples/ipv4_multicast/main.h b/examples/ipv4_multicast/main.h\ndeleted file mode 100644\nindex f8c8415..0000000\n--- a/examples/ipv4_multicast/main.h\n+++ /dev/null\n@@ -1,46 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c\nindex e16c914..c58ce3e 100644\n--- a/examples/l2fwd/main.c\n+++ b/examples/l2fwd/main.c\n@@ -70,8 +70,6 @@\n #include <rte_mempool.h>\n #include <rte_mbuf.h>\n \n-#include \"main.h\"\n-\n #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1\n \n #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)\n@@ -581,7 +579,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\ndiff --git a/examples/l2fwd/main.h b/examples/l2fwd/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/l2fwd/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c\nindex 4dd6b34..7be2d50 100644\n--- a/examples/l3fwd-acl/main.c\n+++ b/examples/l3fwd-acl/main.c\n@@ -73,8 +73,6 @@\n #include <rte_string_fns.h>\n #include <rte_acl.h>\n \n-#include \"main.h\"\n-\n #define DO_RFC_1812_CHECKS\n \n #define RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1\n@@ -1966,7 +1964,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tint ret;\ndiff --git a/examples/l3fwd-acl/main.h b/examples/l3fwd-acl/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/l3fwd-acl/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c\nindex 3bf63ff..a498a46 100644\n--- a/examples/l3fwd-power/main.c\n+++ b/examples/l3fwd-power/main.c\n@@ -76,8 +76,6 @@\n #include <rte_timer.h>\n #include <rte_power.h>\n \n-#include \"main.h\"\n-\n #define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1\n \n #define MAX_PKT_BURST 32\n@@ -1510,7 +1508,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tint ret;\ndiff --git a/examples/l3fwd-power/main.h b/examples/l3fwd-power/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/l3fwd-power/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c\nindex f567aa8..497fea8 100644\n--- a/examples/l3fwd-vf/main.c\n+++ b/examples/l3fwd-vf/main.c\n@@ -73,8 +73,6 @@\n #include <rte_udp.h>\n #include <rte_string_fns.h>\n \n-#include \"main.h\"\n-\n #define APP_LOOKUP_EXACT_MATCH 0\n #define APP_LOOKUP_LPM 1\n #define DO_RFC_1812_CHECKS\n@@ -976,7 +974,7 @@ init_mem(unsigned nb_mbuf)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tint ret;\ndiff --git a/examples/l3fwd-vf/main.h b/examples/l3fwd-vf/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/l3fwd-vf/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c\nindex 01220e3..a643d2f 100644\n--- a/examples/l3fwd/main.c\n+++ b/examples/l3fwd/main.c\n@@ -73,8 +73,6 @@\n #include <rte_udp.h>\n #include <rte_string_fns.h>\n \n-#include \"main.h\"\n-\n #define APP_LOOKUP_EXACT_MATCH 0\n #define APP_LOOKUP_LPM 1\n #define DO_RFC_1812_CHECKS\n@@ -2445,7 +2443,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_conf *qconf;\n \tint ret;\ndiff --git a/examples/l3fwd/main.h b/examples/l3fwd/main.h\ndeleted file mode 100644\nindex eb13b29..0000000\n--- a/examples/l3fwd/main.h\n+++ /dev/null\n@@ -1,41 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#define MAIN main\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c\nindex b8b7571..e8e677f 100644\n--- a/examples/link_status_interrupt/main.c\n+++ b/examples/link_status_interrupt/main.c\n@@ -71,8 +71,6 @@\n #include <rte_mempool.h>\n #include <rte_mbuf.h>\n \n-#include \"main.h\"\n-\n #define RTE_LOGTYPE_LSI RTE_LOGTYPE_USER1\n \n #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)\n@@ -630,7 +628,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\ndiff --git a/examples/link_status_interrupt/main.h b/examples/link_status_interrupt/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/link_status_interrupt/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/load_balancer/main.c b/examples/load_balancer/main.c\nindex 47b0ba7..d0e2c05 100644\n--- a/examples/load_balancer/main.c\n+++ b/examples/load_balancer/main.c\n@@ -75,7 +75,7 @@\n #include \"main.h\"\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tuint32_t lcore;\n \tint ret;\ndiff --git a/examples/load_balancer/main.h b/examples/load_balancer/main.h\nindex 82cdf95..d9f878b 100644\n--- a/examples/load_balancer/main.h\n+++ b/examples/load_balancer/main.h\n@@ -368,12 +368,4 @@ uint32_t app_get_lcores_io_rx(void);\n uint32_t app_get_lcores_worker(void);\n void app_print_params(void);\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n #endif /* _MAIN_H_ */\ndiff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c\nindex 30518c0..fdcc3c6 100644\n--- a/examples/multi_process/client_server_mp/mp_server/init.c\n+++ b/examples/multi_process/client_server_mp/mp_server/init.c\n@@ -68,7 +68,6 @@\n #include \"common.h\"\n #include \"args.h\"\n #include \"init.h\"\n-#include \"main.h\"\n \n #define MBUFS_PER_CLIENT 1536\n #define MBUFS_PER_PORT 1536\ndiff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c\nindex b3887b1..01ccd37 100644\n--- a/examples/multi_process/client_server_mp/mp_server/main.c\n+++ b/examples/multi_process/client_server_mp/mp_server/main.c\n@@ -72,7 +72,6 @@\n #include \"common.h\"\n #include \"args.h\"\n #include \"init.h\"\n-#include \"main.h\"\n \n /*\n * When doing reads from the NIC or the client queues,\n@@ -301,7 +300,7 @@ do_packet_forwarding(void)\n }\n \n int\n-MAIN(int argc, char *argv[])\n+main(int argc, char *argv[])\n {\n \t/* initialise the system */\n \tif (init(argc, argv) < 0 )\ndiff --git a/examples/multi_process/client_server_mp/mp_server/main.h b/examples/multi_process/client_server_mp/mp_server/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/multi_process/client_server_mp/mp_server/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/multi_process/l2fwd_fork/main.c b/examples/multi_process/l2fwd_fork/main.c\nindex c887b63..de64bc9 100644\n--- a/examples/multi_process/l2fwd_fork/main.c\n+++ b/examples/multi_process/l2fwd_fork/main.c\n@@ -74,7 +74,6 @@\n #include <rte_mbuf.h>\n #include <rte_malloc.h>\n \n-#include \"main.h\"\n #include \"flib.h\"\n \n #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1\n@@ -999,7 +998,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tstruct lcore_queue_conf *qconf;\n \tstruct rte_eth_dev_info dev_info;\ndiff --git a/examples/multi_process/l2fwd_fork/main.h b/examples/multi_process/l2fwd_fork/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/multi_process/l2fwd_fork/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c\nindex c02ac50..b05b631 100644\n--- a/examples/qos_meter/main.c\n+++ b/examples/qos_meter/main.c\n@@ -358,7 +358,7 @@ parse_args(int argc, char **argv)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tuint32_t lcore_id;\n \tint ret;\ndiff --git a/examples/qos_meter/main.h b/examples/qos_meter/main.h\nindex 7bffce5..530bf69 100644\n--- a/examples/qos_meter/main.h\n+++ b/examples/qos_meter/main.h\n@@ -48,15 +48,6 @@ enum policer_action policer_table[e_RTE_METER_COLORS][e_RTE_METER_COLORS] =\n \t{ DROP, DROP, RED}\n };\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-\n #if APP_MODE == APP_MODE_FWD\n \n #define FUNC_METER(a,b,c,d) color, flow_id=flow_id, pkt_len=pkt_len, time=time\ndiff --git a/examples/qos_sched/main.c b/examples/qos_sched/main.c\nindex 19a4f85..ed3cbea 100644\n--- a/examples/qos_sched/main.c\n+++ b/examples/qos_sched/main.c\n@@ -223,7 +223,7 @@ app_stat(void)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tint ret;\n \ndiff --git a/examples/qos_sched/main.h b/examples/qos_sched/main.h\nindex f3b3956..971ec27 100644\n--- a/examples/qos_sched/main.h\n+++ b/examples/qos_sched/main.h\n@@ -40,12 +40,6 @@ extern \"C\" {\n \n #include <rte_sched.h>\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#error \"Baremetal is not supported\"\n-#else\n-#define MAIN main\n-#endif\n-\n #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1\n \n /*\n@@ -177,7 +171,6 @@ extern struct ring_thresh tx_thresh;\n \n extern struct rte_sched_port_params port_params;\n \n-int MAIN(int argc, char **argv);\n int app_parse_args(int argc, char **argv);\n int app_init(void);\n \ndiff --git a/examples/quota_watermark/qw/main.c b/examples/quota_watermark/qw/main.c\nindex c8bd62f..f269546 100644\n--- a/examples/quota_watermark/qw/main.c\n+++ b/examples/quota_watermark/qw/main.c\n@@ -304,7 +304,7 @@ send_stage(__attribute__((unused)) void *args)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n int ret;\n unsigned int lcore_id, master_lcore_id, last_lcore_id;\ndiff --git a/examples/quota_watermark/qw/main.h b/examples/quota_watermark/qw/main.h\nindex 3b78324..79d3c26 100644\n--- a/examples/quota_watermark/qw/main.h\n+++ b/examples/quota_watermark/qw/main.h\n@@ -36,12 +36,6 @@\n \n #include \"../include/conf.h\"\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n enum ring_state {\n RING_READY,\n RING_OVERLOADED,\n@@ -62,7 +56,4 @@ is_bit_set(int i, unsigned int mask)\n return ((1 << i) & mask);\n }\n \n-\n-int MAIN(int argc, char **argv);\n-\n #endif /* _MAIN_H_ */\ndiff --git a/examples/quota_watermark/qwctl/qwctl.c b/examples/quota_watermark/qwctl/qwctl.c\nindex 8bf9e33..eb2f618 100644\n--- a/examples/quota_watermark/qwctl/qwctl.c\n+++ b/examples/quota_watermark/qwctl/qwctl.c\n@@ -71,7 +71,7 @@ setup_shared_variables(void)\n low_watermark = (unsigned int *) qw_memzone->addr + sizeof(int);\n }\n \n-int MAIN(int argc, char **argv)\n+int main(int argc, char **argv)\n {\n int ret;\n struct cmdline *cl;\ndiff --git a/examples/quota_watermark/qwctl/qwctl.h b/examples/quota_watermark/qwctl/qwctl.h\nindex 4209307..8d146e5 100644\n--- a/examples/quota_watermark/qwctl/qwctl.h\n+++ b/examples/quota_watermark/qwctl/qwctl.h\n@@ -34,15 +34,7 @@\n #ifndef _MAIN_H_\n #define _MAIN_H_\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n extern int *quota;\n extern unsigned int *low_watermark;\n \n-int MAIN(int argc, char **argv);\n-\n #endif /* _MAIN_H_ */\ndiff --git a/examples/timer/main.c b/examples/timer/main.c\nindex a5ff015..5a5d33c 100644\n--- a/examples/timer/main.c\n+++ b/examples/timer/main.c\n@@ -49,8 +49,6 @@\n #include <rte_timer.h>\n #include <rte_debug.h>\n \n-#include \"main.h\"\n-\n #define TIMER_RESOLUTION_CYCLES 20000000ULL /* around 10ms at 2 Ghz */\n \n static struct rte_timer timer0;\n@@ -115,7 +113,7 @@ lcore_mainloop(__attribute__((unused)) void *arg)\n }\n \n int\n-MAIN(int argc, char **argv)\n+main(int argc, char **argv)\n {\n \tint ret;\n \tuint64_t hz;\ndiff --git a/examples/timer/main.h b/examples/timer/main.h\ndeleted file mode 100644\nindex f54938b..0000000\n--- a/examples/timer/main.h\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN(int argc, char **argv);\n-\n-#endif /* _MAIN_H_ */\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex c81b8f5..b01df51 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -3528,7 +3528,7 @@ setup_mempool_tbl(int socket, uint32_t index, char *pool_name,\n * device is also registered here to handle the IOCTLs.\n */\n int\n-MAIN(int argc, char *argv[])\n+main(int argc, char *argv[])\n {\n \tstruct rte_mempool *mbuf_pool = NULL;\n \tunsigned lcore_id, core_id = 0;\n@@ -3694,10 +3694,10 @@ MAIN(int argc, char *argv[])\n \t\t\t}\n \n \t\t\tLOG_DEBUG(VHOST_CONFIG,\n-\t\t\t\t\"in MAIN: mbuf count in mempool at initial \"\n+\t\t\t\t\"in main: mbuf count in mempool at initial \"\n \t\t\t\t\"is: %d\\n\", count_in_mempool);\n \t\t\tLOG_DEBUG(VHOST_CONFIG,\n-\t\t\t\t\"in MAIN: mbuf count in ring at initial is :\"\n+\t\t\t\t\"in main: mbuf count in ring at initial is :\"\n \t\t\t\t\" %d\\n\",\n \t\t\t\trte_ring_count(vpool_array[index].ring));\n \t\t}\ndiff --git a/examples/vhost/main.h b/examples/vhost/main.h\nindex c15d938..6d75da0 100644\n--- a/examples/vhost/main.h\n+++ b/examples/vhost/main.h\n@@ -34,12 +34,6 @@\n #ifndef _MAIN_H_\n #define _MAIN_H_\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n //#define DEBUG\n \n #ifdef DEBUG\n@@ -82,5 +76,4 @@ struct lcore_info\n \tstruct lcore_ll_info\t*lcore_ll;\t/* Pointer to data core specific lcore_ll_info struct */\n };\n \n-int MAIN(int argc, char **argv);\n #endif /* _MAIN_H_ */\ndiff --git a/examples/vhost_xen/main.c b/examples/vhost_xen/main.c\nindex 498de06..8d62f8d 100644\n--- a/examples/vhost_xen/main.c\n+++ b/examples/vhost_xen/main.c\n@@ -1445,7 +1445,7 @@ int init_virtio_net(struct virtio_net_device_ops const * const ops);\n * device is also registered here to handle the IOCTLs.\n */\n int\n-MAIN(int argc, char *argv[])\n+main(int argc, char *argv[])\n {\n \tstruct rte_mempool *mbuf_pool;\n \tunsigned lcore_id, core_id = 0;\ndiff --git a/examples/vhost_xen/main.h b/examples/vhost_xen/main.h\nindex 4010766..481572e 100644\n--- a/examples/vhost_xen/main.h\n+++ b/examples/vhost_xen/main.h\n@@ -34,12 +34,6 @@\n #ifndef _MAIN_H_\n #define _MAIN_H_\n \n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n //#define DEBUG\n \n #ifdef DEBUG\n@@ -80,6 +74,4 @@ struct lcore_info\n {\n \tstruct lcore_ll_info\t*lcore_ll;\t/* Pointer to data core specific lcore_ll_info struct */\n };\n-\n-int MAIN(int argc, char **argv);\n #endif /* _MAIN_H_ */\ndiff --git a/examples/vmdq/main.c b/examples/vmdq/main.c\nindex a162d8b..2d93bbf 100644\n--- a/examples/vmdq/main.c\n+++ b/examples/vmdq/main.c\n@@ -70,8 +70,6 @@\n #include <rte_mbuf.h>\n #include <rte_memcpy.h>\n \n-#include \"main.h\"\n-\n #define MAX_QUEUES 128\n /*\n * For 10 GbE, 128 queues require roughly\n@@ -454,7 +452,6 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port)\n \tether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->s_addr);\n }\n \n-#ifndef RTE_EXEC_ENV_BAREMETAL\n /* When we receive a HUP signal, print out our stats */\n static void\n sighup_handler(int signum)\n@@ -467,7 +464,6 @@ sighup_handler(int signum)\n \t}\n \tprintf(\"\\nFinished handling signal %d\\n\", signum);\n }\n-#endif\n \n /*\n * Main thread that does the work, reading from INPUT_PORT\n@@ -573,7 +569,7 @@ static unsigned check_ports_num(unsigned nb_ports)\n \n /* Main function, does initialisation and calls the per-lcore functions */\n int\n-MAIN(int argc, char *argv[])\n+main(int argc, char *argv[])\n {\n \tstruct rte_mempool *mbuf_pool;\n \tunsigned lcore_id, core_id = 0;\n@@ -581,9 +577,7 @@ MAIN(int argc, char *argv[])\n \tunsigned nb_ports, valid_num_ports;\n \tuint8_t portid;\n \n-#ifndef RTE_EXEC_ENV_BAREMETAL\n \tsignal(SIGHUP, sighup_handler);\n-#endif\n \n \t/* init EAL */\n \tret = rte_eal_init(argc, argv);\ndiff --git a/examples/vmdq/main.h b/examples/vmdq/main.h\ndeleted file mode 100644\nindex f13c9aa..0000000\n--- a/examples/vmdq/main.h\n+++ /dev/null\n@@ -1,46 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN( int argc, char *argv[] );\n-\n-#endif /* ifndef _MAIN_H_ */\ndiff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c\nindex 2f708a1..a09a972 100644\n--- a/examples/vmdq_dcb/main.c\n+++ b/examples/vmdq_dcb/main.c\n@@ -70,8 +70,6 @@\n #include <rte_mbuf.h>\n #include <rte_memcpy.h>\n \n-#include \"main.h\"\n-\n /* basic constants used in application */\n #define NUM_QUEUES 128\n \n@@ -341,7 +339,6 @@ vmdq_parse_args(int argc, char **argv)\n }\n \n \n-#ifndef RTE_EXEC_ENV_BAREMETAL\n /* When we receive a HUP signal, print out our stats */\n static void\n sighup_handler(int signum)\n@@ -354,7 +351,6 @@ sighup_handler(int signum)\n \t}\n \tprintf(\"\\nFinished handling signal %d\\n\", signum);\n }\n-#endif\n \n /*\n * Main thread that does the work, reading from INPUT_PORT\n@@ -429,7 +425,7 @@ static unsigned check_ports_num(unsigned nb_ports)\n \n /* Main function, does initialisation and calls the per-lcore functions */\n int\n-MAIN(int argc, char *argv[])\n+main(int argc, char *argv[])\n {\n \tunsigned cores;\n \tstruct rte_mempool *mbuf_pool;\n@@ -439,9 +435,7 @@ MAIN(int argc, char *argv[])\n \tunsigned nb_ports, valid_num_ports;\n \tuint8_t portid;\n \n-#ifndef RTE_EXEC_ENV_BAREMETAL\n \tsignal(SIGHUP, sighup_handler);\n-#endif\n \n \t/* init EAL */\n \tret = rte_eal_init(argc, argv);\ndiff --git a/examples/vmdq_dcb/main.h b/examples/vmdq_dcb/main.h\ndeleted file mode 100644\nindex f13c9aa..0000000\n--- a/examples/vmdq_dcb/main.h\n+++ /dev/null\n@@ -1,46 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-\n-#ifdef RTE_EXEC_ENV_BAREMETAL\n-#define MAIN _main\n-#else\n-#define MAIN main\n-#endif\n-\n-int MAIN( int argc, char *argv[] );\n-\n-#endif /* ifndef _MAIN_H_ */\n", "prefixes": [ "dpdk-dev", "5/5" ] }