From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Wed, 10 Jul 2013 04:14:12 +0000 (+0900)
Subject: emulator: modified error popup message
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~18^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e49137353d5cfff73b9234a4caed72193d0983b6;p=sdk%2Femulator%2Fqemu.git

emulator: modified error popup message

modified error popup message when emulator failed to
load a bios file.

Change-Id: I6b9d1d8e824dca37b387d9afd36c534fff4fb3c9
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c
index e3b4c02ce7..5522d99691 100644
--- a/hw/block/pc_sysfw.c
+++ b/hw/block/pc_sysfw.c
@@ -143,10 +143,6 @@ static void pc_system_flash_init(MemoryRegion *rom_memory,
     pc_isa_bios_init(rom_memory, flash_mem, size);
 }
 
-#ifdef CONFIG_MARU
-extern char* qemu_get_data_dir(void);
-#endif
-
 static void old_pc_system_rom_init(MemoryRegion *rom_memory)
 {
     char *filename;
@@ -177,26 +173,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory)
     bios_error:
         fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
 #ifdef CONFIG_MARU
-        char *error_msg = NULL;
-        const char *path = qemu_get_data_dir();
-        char *bios_path = NULL;
-        int bios_len = 0;
-
-        bios_len = strlen(path) + strlen("/") + strlen(bios_name) + 1;
-        bios_path = g_malloc(bios_len * sizeof(char));
-        if (!bios_path) {
-            fprintf(stderr, "qemu: failed to allocate memory\n");
-        }
-        snprintf(bios_path, bios_len, "%s/%s", path, bios_name);
-        error_msg = maru_convert_path(error_msg, bios_path);
-        maru_register_exit_msg(MARU_EXIT_BIOS_FILE_EXCEPTION, error_msg);
-
-        if (bios_path) {
-            g_free(bios_path);
-        }
-        if (error_msg) {
-            g_free(error_msg);
-        }
+        maru_register_exit_msg(MARU_EXIT_BIOS_FILE_EXCEPTION, bios_name);
 #endif
         exit(1);
     }
diff --git a/vl.c b/vl.c
index 98f808d9e6..0adbdd1022 100644
--- a/vl.c
+++ b/vl.c
@@ -2365,15 +2365,6 @@ char *qemu_find_file(int type, const char *name)
     return NULL;
 }
 
-#ifdef CONFIG_MARU
-const char *qemu_get_data_dir(void);
-
-const char *qemu_get_data_dir(void)
-{
-    return data_dir;
-}
-#endif
-
 static int device_help_func(QemuOpts *opts, void *opaque)
 {
     return qdev_device_help(opts);