From 58bd7a23e130ab8452b51b02dc47f795f087c0c2 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Wed, 23 Nov 2016 14:59:52 +0900 Subject: [PATCH] emul_state: choose vm_name specified in conf file When "vm_name" that is specified in conf file is different from image file name, we should choose "vm_name". Change-Id: Ia234784142808bae787d12ac6d01377b14e4c2bc Signed-off-by: SeokYeon Hwang --- tizen/src/emul_state.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c index adb0b37c44..4152993d14 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -377,13 +377,14 @@ const char *get_vm_name(void) // when drive_file_vm_name != var_vm_name // we should warn to users LOG_WARNING("vm_name and image_file_name is not matched\n"); + } + // we choose drive_file_vm_name when var_vm_name is not provided + if (!var_vm_name || strlen(var_vm_name) == 0) { + vm_name = g_strdup(drive_file_vm_name + start_index); } else { - // we choose drive_file_vm_name when var_vm_name is not provided - // or they contain same name + vm_name = g_strdup(var_vm_name); } - vm_name = g_strdup(drive_file_vm_name + start_index); - g_free(drive_file_vm_name); LOG_INFO("VM name: %s\n", vm_name); -- 2.34.1