Move sdb_setup() and fix qemu_main()'s first arguments

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index e0ea179..61f04ca 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -94,6 +94,9 @@ static void parse_options(int argc, char* argv[], int* skin_argc, char*** skin_a
 
                        *qemu_argc = argc - j - i + 1;
                        *qemu_argv = &(argv[j]);
+
+                       argv[j] = argv[0];
+
                        break;
                }
        }
@@ -123,14 +126,19 @@ int main(int argc, char* argv[])
        }
 */
 
-       printf("%d\n", qemu_argc);
+//     printf("%d\n", qemu_argc);
+       printf("Start emulator : =====================================\n");
        for(i = 0; i < qemu_argc; ++i)
        {
                printf("%s ", qemu_argv[i]);
        }
        printf("\n");
+       printf("======================================================\n");
 
        construct_main_window(skin_argc, skin_argv);
+
+       sdb_setup();
+
        qemu_main(qemu_argc, qemu_argv, NULL);
 
        return 0;

diff --git a/vl.c b/vl.c
index 7eb25af..1e62bd1 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -176,7 +176,6 @@ int qemu_main(int argc, char **argv, char **envp);
 #include "ui/qemu-spice.h"
 
 #ifdef CONFIG_MARU
-#include "tizen/src/sdb.h"
 #include "tizen/src/skin/maruskin_sdl.h"
 #endif
 
@@ -3483,11 +3482,6 @@ int main(int argc, char **argv, char **envp)
     qemu_register_reset(qbus_reset_all_fn, sysbus_get_default());
     qemu_run_machine_init_done_notifiers();
 
-#ifdef CONFIG_MARU
-    /* call sdb setup function */
-    sdb_setup();
-#endif
-
     qemu_system_reset(VMRESET_SILENT);
     if (loadvm) {
         if (load_vmstate(loadvm) < 0) {