emulator: modify the way to set/get vm name

Cherry-picked from 13782b9d574b8f4014dcbd93bcde61175420291b

Change-Id: Id14f835a521354ac4b53ec24b2909dceb0da8e9c
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

diff --git a/tizen/src/ecs/ecs_msg_device.c b/tizen/src/ecs/ecs_msg_device.c
index 6647700327032f71f91a2d1950acef6d3f529b14..28eecd99a020796a75348f7f5d8eb7b111c0512a 100644 (file)
--- a/tizen/src/ecs/ecs_msg_device.c
+++ b/tizen/src/ecs/ecs_msg_device.c
@@ -47,7 +47,7 @@
 
 MULTI_DEBUG_CHANNEL(qemu, ecs);
 
-static void msgproc_device_ans(ECS_Client* ccli, const char* category, bool succeed, char* data)
+static void msgproc_device_ans(ECS_Client* ccli, const char* category, bool succeed, const char* data)
 {
     if (ccli == NULL) {
         return;
@@ -414,7 +414,7 @@ bool msgproc_device_req(ECS_Client* ccli, ECS__DeviceReq* msg)
     } else if (!strcmp(cmd, "input")) {
         msgproc_device_req_input(ccli, msg, cmd);
     } else if (!strcmp(cmd, "vmname")) {
-        char* vmname = get_emul_vm_name();
+        const char* vmname = get_emul_vm_name();
         msgproc_device_ans(ccli, cmd, true, vmname);
     } else if (!strcmp(cmd, "nfc")) {
         msgproc_device_req_nfc(ccli, msg);

diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c
index d44c8834320ac54adbc0858da2ada90002858f3a..0dee63d0cff1c840cd26160666f5981928a7fce6 100644 (file)
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -378,13 +378,12 @@ const char* get_drive_image_file(void)
 }
 
 /* vm name */
-void set_emul_vm_name(char *vm_name)
+const char* get_emul_vm_name(void)
 {
-    _emul_info.vm_name = vm_name;
-}
+    if (!_emul_info.vm_name) {
+        _emul_info.vm_name = get_variable("vm_name");
+    }
 
-char* get_emul_vm_name(void)
-{
     return _emul_info.vm_name;
 }
 

diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h
index 43183a135e33fda0522454d16a86d6dc8bc5130c..a97bc170b94ce4f5e450867ecf06e90ebc779c17 100644 (file)
--- a/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@ -104,7 +104,7 @@ typedef  struct EmulatorConfigInfo {
     char http_proxy_port[MAX_PORT_LEN];
     int spice_port;
     int websocket_port;
-    char *vm_name;
+    const char *vm_name;
     /* add here */
     int serial_port;
 } EmulatorConfigInfo;
@@ -151,7 +151,6 @@ void set_emulator_condition(int state);
 void set_emul_rotation(short rotation_type);
 void set_emul_caps_lock_state(int state);
 void set_emul_num_lock_state(int state);
-void set_emul_vm_name(char *vm_name);
 void set_emul_http_proxy_addr(char *addr);
 void set_emul_http_proxy_port(char *port);
 void set_emul_hds_attached(bool attached);
@@ -184,7 +183,7 @@ int get_host_lock_key_state(int key);
 int get_host_lock_key_state_darwin(int key);
 int get_emul_caps_lock_state(void);
 int get_emul_num_lock_state(void);
-char* get_emul_vm_name(void);
+const char* get_emul_vm_name(void);
 char* get_emul_http_proxy_addr(void);
 char* get_emul_http_proxy_port(void);
 bool get_emul_hds_attached(void);

diff --git a/tizen/src/emulator_legacy.c b/tizen/src/emulator_legacy.c
index 17c2a4e589463a9391300b9244b5ee17160f0db2..0079c0b1943da955201b43790bf18280dbeb4137 100644 (file)
--- a/tizen/src/emulator_legacy.c
+++ b/tizen/src/emulator_legacy.c
@@ -147,7 +147,7 @@ static void set_image_and_log_path(char *qemu_argv)
         strcpy(tizen_target_path, g_path_get_dirname(path));
     }
 
-    set_emul_vm_name(g_path_get_basename(tizen_target_path));
+    set_variable("vm_name", g_path_get_basename(tizen_target_path), true);
     set_variable("drive_image_file", path, true);
     free(path);