[Title] move proxy kernel agument

[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index e925a6f..19c1b53 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -90,11 +90,11 @@ static void construct_main_window(int skin_argc, char* skin_argv[])
 
 }
 
-static void parse_options(int argc, char* argv[], char* proxy, char* dns1, char* dns2, int* skin_argc, char*** skin_argv, int* qemu_argc, char*** qemu_argv)
+static void parse_options(int argc, char* argv[], int* skin_argc, char*** skin_argv, int* qemu_argc, char*** qemu_argv)
 {
     int i;
     int j;
-    char *point = NULL;
+
 // FIXME !!!
 // TODO:
    
@@ -117,11 +117,6 @@ static void parse_options(int argc, char* argv[], char* proxy, char* dns1, char*
 
             argv[j] = argv[0];
         }
-        if((point = strstr(argv[j], "console")) != NULL)
-        {
-            argv[j] = g_strdup_printf("%s proxy=%s dns1=%s dns2=%s", argv[j], proxy, dns1, dns2);
-            break;
-        }
     }
 }
 
@@ -177,17 +172,14 @@ int main(int argc, char* argv[])
         return NULL;
     }
 #endif
+
     int skin_argc = 0;
     char** skin_argv = NULL;
 
     int qemu_argc = 0;
     char** qemu_argv = NULL;
-    char proxy[MIDBUF] ={0}, dns1[MIDBUF] = {0}, dns2[MIDBUF] = {0};
-       
-    gethostproxy(proxy);
-       gethostDNS(dns1, dns2);
 
-    parse_options(argc, argv, proxy, dns1, dns2, &skin_argc, &skin_argv, &qemu_argc, &qemu_argv);
+    parse_options(argc, argv, &skin_argc, &skin_argv, &qemu_argc, &qemu_argv);
 
     int i;
 
@@ -217,7 +209,7 @@ int main(int argc, char* argv[])
     }
 
     INFO("\n");
-    INFO("======================================================\n");
+    //INFO("======================================================\n");
 
     INFO("skin args : =====================================\n");
     for(i = 0; i < skin_argc; ++i)

diff --git a/vl.c b/vl.c
index f646e25..463f986 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -179,6 +179,7 @@ int qemu_main(int argc, char **argv, char **envp);
 
 #ifdef CONFIG_MARU
 #include "tizen/src/maru_sdl.h"
+#include "tizen/src/option.h"
 #endif
 
 //#define DEBUG_NET
@@ -2203,6 +2204,11 @@ int main(int argc, char **argv, char **envp)
     const char *trace_events = NULL;
     const char *trace_file = NULL;
 
+#ifdef CONFIG_MARU
+    #define MIDBUF  128
+    char proxy[MIDBUF] ={0}, dns1[MIDBUF] = {0}, dns2[MIDBUF] = {0};
+#endif
+
     atexit(qemu_run_exit_notifiers);
     error_set_progname(argv[0]);
 
@@ -2440,7 +2446,15 @@ int main(int argc, char **argv, char **envp)
                 kernel_filename = optarg;
                 break;
             case QEMU_OPTION_append:
+#ifdef CONFIG_MARU
+                gethostproxy(proxy);
+                gethostDNS(dns1, dns2);
+
+                kernel_cmdline = g_strdup_printf("%s proxy=%s dns1=%s dns2=%s", optarg, proxy, dns1, dns2);
+                fprintf(stdout, "kernel command : %s\n", kernel_cmdline);
+#else
                 kernel_cmdline = optarg;
+#endif
                 break;
             case QEMU_OPTION_cdrom:
                 drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS);
@@ -3369,6 +3383,9 @@ int main(int argc, char **argv, char **envp)
 
     machine->init(ram_size, boot_devices,
                   kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
+#ifdef CONFIG_MARU
+    g_free((gchar *)kernel_cmdline);
+#endif
 
     cpu_synchronize_all_post_init();