summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeokYeon Hwang <syeon.hwang@samsung.com>2014-04-24 16:46:09 +0900
committerSeokYeon Hwang <syeon.hwang@samsung.com>2014-04-24 16:46:09 +0900
commitf63c379816b3f2bd70d2720c536396c447c5f8a1 (patch)
tree60b85cda8cebb776a98c83c5e93ff36cbca24604
parent52a021736ce739516e172048040e0ca8a19c05ff (diff)
downloadqemu-f63c379816b3f2bd70d2720c536396c447c5f8a1.tar.gz
qemu-f63c379816b3f2bd70d2720c536396c447c5f8a1.tar.bz2
qemu-f63c379816b3f2bd70d2720c536396c447c5f8a1.zip
emulator: clean-up "emulator.c" for "envp"
Change-Id: I8b5f97f2bb51d1e37164856589d2193ef5244738 Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
-rw-r--r--tizen/src/emulator.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index d4bea6be9a..1e9a8dd743 100644
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -520,11 +520,7 @@ void prepare_maru(void)
int qemu_main(int argc, char **argv, char **envp);
-#ifdef CONFIG_LINUX
static int emulator_main(int argc, char *argv[], char **envp)
-#else
-static int emulator_main(int argc, char *argv[])
-#endif
{
parse_options(argc, argv, &_skin_argc,
&_skin_argv, &_qemu_argc, &_qemu_argv);
@@ -560,11 +556,8 @@ static int emulator_main(int argc, char *argv[])
socket_init();
INFO("qemu main start!\n");
-#ifdef CONFIG_LINUX
qemu_main(_qemu_argc, _qemu_argv, envp);
-#else
- qemu_main(_qemu_argc, _qemu_argv, NULL);
-#endif
+
exit_emulator();
return 0;
@@ -579,7 +572,7 @@ static void* main_thread(void* args)
int argc = g_argc;
argv = (char**) args;
- emulator_main(argc, argv);
+ emulator_main(argc, argv, NULL);
thread_running = 0;
pthread_exit(NULL);
@@ -612,7 +605,7 @@ int main(int argc, char *argv[], char **envp)
int main(int argc, char *argv[])
{
maru_register_exception_handler();
- return emulator_main(argc, argv);
+ return emulator_main(argc, argv, NULL);
}
#endif