summaryrefslogtreecommitdiff
path: root/examples/vm_power_manager
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/vm_power_manager
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/vm_power_manager')
-rw-r--r--examples/vm_power_manager/guest_cli/main.c3
-rw-r--r--examples/vm_power_manager/guest_cli/main.h52
-rw-r--r--examples/vm_power_manager/main.c3
-rw-r--r--examples/vm_power_manager/main.h52
4 files changed, 2 insertions, 108 deletions
diff --git a/examples/vm_power_manager/guest_cli/main.c b/examples/vm_power_manager/guest_cli/main.c
index f8e6a7d..7ee2296 100644
--- a/examples/vm_power_manager/guest_cli/main.c
+++ b/examples/vm_power_manager/guest_cli/main.c
@@ -51,7 +51,6 @@
#include <rte_config.h>
#include "vm_power_cli_guest.h"
-#include "main.h"
static void
sig_handler(int signo)
@@ -66,7 +65,7 @@ sig_handler(int signo)
}
int
-MAIN(int argc, char **argv)
+main(int argc, char **argv)
{
int ret;
unsigned lcore_id;
diff --git a/examples/vm_power_manager/guest_cli/main.h b/examples/vm_power_manager/guest_cli/main.h
deleted file mode 100644
index 7b4c3da..0000000
--- a/examples/vm_power_manager/guest_cli/main.h
+++ /dev/null
@@ -1,52 +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 /* _MAIN_H_ */
-
-#ifndef MAIN_H_
-#define MAIN_H_
-
-
-
-#endif /* MAIN_H_ */
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index 875274e..dfca7b8 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -58,7 +58,6 @@
#include "channel_monitor.h"
#include "power_manager.h"
#include "vm_power_cli.h"
-#include "main.h"
static int
run_monitor(__attribute__((unused)) void *arg)
@@ -82,7 +81,7 @@ sig_handler(int signo)
}
int
-MAIN(int argc, char **argv)
+main(int argc, char **argv)
{
int ret;
unsigned lcore_id;
diff --git a/examples/vm_power_manager/main.h b/examples/vm_power_manager/main.h
deleted file mode 100644
index 7b4c3da..0000000
--- a/examples/vm_power_manager/main.h
+++ /dev/null
@@ -1,52 +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 /* _MAIN_H_ */
-
-#ifndef MAIN_H_
-#define MAIN_H_
-
-
-
-#endif /* MAIN_H_ */