emulator: modified way to set/get vm name

Change-Id: I30a4cacef75a113b0cc255f17b40c874d5fe961e
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

diff --git a/tizen/src/ecs/ecs_msg_device.c b/tizen/src/ecs/ecs_msg_device.c
index b4ad777..8ebf2e0 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;
@@ -419,7 +419,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 8ed7d33..24a9b25 100644 (file)
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -438,13 +438,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 90668b4..a807b4c 100644 (file)
--- a/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@ -107,7 +107,7 @@ typedef  struct EmulatorConfigInfo {
     char host_ip[16];
 
     int spice_port;
-    char *vm_name;
+    const char *vm_name;
     const char *skin_path;
     bool gpu_accel_enable;
     const char *file_sharing_path;
@@ -154,7 +154,6 @@ void set_emul_vm_base_port(int port);
 void set_emul_ecs_port(int port);
 void set_emul_guest_ip(char *ip);
 void set_emul_host_ip(char *ip);
-void set_emul_vm_name(char *vm_name);
 void set_emul_gpu_accel(bool enable);
 void set_emul_file_sharing_path(const char *path);
 void set_emul_ram_size(const char *size);
@@ -187,7 +186,7 @@ int get_emul_vm_base_port(void);
 int get_device_serial_number(void);
 int get_emul_ecs_port(void);
 int get_emul_serial_port(void);
-char* get_emul_vm_name(void);
+const char* get_emul_vm_name(void);
 int get_emul_spice_port(void);
 const char* get_emul_skin_path(void);
 bool get_emul_gpu_accel(void);

diff --git a/tizen/src/emulator_legacy.c b/tizen/src/emulator_legacy.c
index b4da32b..9472223 100644 (file)
--- a/tizen/src/emulator_legacy.c
+++ b/tizen/src/emulator_legacy.c
@@ -144,7 +144,7 @@ static void set_image_and_log_path(char *qemu_argv)
     }
 
     set_emul_vm_data_path(tizen_target_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);