[Title]set target path

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

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index e4ef655b3e5531749c0c3de8edf2513dd614ddc7..eff14ec257704ae8dac3c86d4ff5296a5141cbe4 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -140,8 +140,12 @@ void set_image_and_log_path(char* qemu_argv)
         path[j++] = qemu_argv[i];
     }
     path[j] = '\0';
-    strcpy(tizen_target_path, path);
-    strcpy(logfile, g_path_get_dirname(tizen_target_path));
+    if(!g_path_is_absolute(path))
+        strcpy(tizen_target_path, g_get_current_dir());
+    else
+        strcpy(tizen_target_path, g_path_get_dirname(path));
+
+    strcpy(logfile, tizen_target_path);
        strcat(logfile, "/logs/emulator.log");
 
 }
@@ -225,11 +229,8 @@ int main(int argc, char* argv[])
     
     redir_output();
        
-
     int i;
 
-    char *option = NULL;
-
     fprintf(stdout, "qemu args : ==========================================\n");
     for(i = 0; i < qemu_argc; ++i)
     {

diff --git a/vl.c b/vl.c
index dc37edd8fe2fa5d05a98af42e39ef1f8f95baff1..8ba96c776b57bc9532c582ec6540442f7c5f0a48 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -180,7 +180,6 @@ int qemu_main(int argc, char **argv, char **envp);
 #ifdef CONFIG_MARU
 #include "tizen/src/maru_sdl.h"
 #include "tizen/src/option.h"
-#include "tizen/src/sdb.h"
 #endif
 
 //#define DEBUG_NET
@@ -192,7 +191,6 @@ int qemu_main(int argc, char **argv, char **envp);
 
 #ifdef CONFIG_MARU
 #define VIRTIOGL_DEV_NAME "virtio-gl-pci"
-extern int tizen_base_port;
 extern int gl_acceleration_capability_check (void);
 #endif
 
@@ -3578,11 +3576,6 @@ int main(int argc, char **argv, char **envp)
         vm_start();
     }
 
-#ifdef CONFIG_MARU
-    /* call sdb setup function */
-       sdb_setup(tizen_base_port);
-#endif
-
     os_setup_post();
 
     resume_all_vcpus();