Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: I6753087cb299be5eb2b17c2ed256786021a4a27d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

1 files changed, 6 insertions, 15 deletions

diff --git a/vl.c b/vl.c
index a1d9dcdf17..1fb6182e81 100644
--- a/vl.c
+++ b/vl.c
@@ -136,6 +136,7 @@ int qemu_main(int argc, char **argv, char **envp);
 #include "tizen/src/ui/qt5.h"
 #include "tizen/src/util/ui_operations.h"
 #include "tizen/src/ecs/ecs.h"
+#include "tizen/src/util/error_handler.h"
 # ifdef CONFIG_JAVA_UI
 #include "tizen/src/display/maru_display.h"
 # endif
@@ -2202,7 +2203,7 @@ static DisplayType select_display(const char *p)
                 // Resolution should be formed "640x480" or "640*480".
                 int width = (int)g_ascii_strtoll(opts, &endptr, 10);
                 int height = (int)g_ascii_strtoll(++endptr, &endptr, 10);
-                if (width == 0 || height == 0) {
+                if (width <= 0 || height <= 0) {
                     goto invalid_maru_qt_args;
                 }
                 set_initial_display_resolution(width, height);
@@ -2211,7 +2212,7 @@ static DisplayType select_display(const char *p)
                 opts = nextopt;
                 char *endptr = NULL;
                 int dpi = (int)g_ascii_strtoll(opts, &endptr, 10);
-                if (dpi == 0) {
+                if (dpi <= 0) {
                     goto invalid_maru_qt_args;
                 }
                 set_display_pixel_density(dpi);
@@ -3304,10 +3305,6 @@ int main(int argc, char **argv, char **envp)
                             "'%s' option", slots_str ? "maxmem" : "slots");
                     exit(EXIT_FAILURE);
                 }
-
-#ifdef CONFIG_MARU
-                set_emul_ram_size(optarg);
-#endif
                 break;
             }
 #ifdef CONFIG_TPM
@@ -3489,22 +3486,13 @@ int main(int argc, char **argv, char **envp)
 
                 qemu_opt_set_bool(fsdev, "readonly",
                                 qemu_opt_get_bool(opts, "readonly", 0));
-#ifdef CONFIG_MARU
-                device = qemu_opts_create(qemu_find_opts("device"), "fileshare", 0,
-                                          &error_abort);
-#else
                 device = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
                                           &error_abort);
-#endif
                 qemu_opt_set(device, "driver", "virtio-9p-pci");
                 qemu_opt_set(device, "fsdev",
                              qemu_opt_get(opts, "mount_tag"));
                 qemu_opt_set(device, "mount_tag",
                              qemu_opt_get(opts, "mount_tag"));
-
-#ifdef CONFIG_MARU
-                set_emul_file_sharing_path(qemu_opt_get(opts, "path"));
-#endif
                 break;
             }
             case QEMU_OPTION_virtfs_synth: {
@@ -4636,6 +4624,9 @@ int main(int argc, char **argv, char **envp)
         }
     }
 
+#ifdef CONFIG_MARU
+    enable_print_backtrace_at_normal_exit();
+#endif
     main_loop();
     bdrv_close_all();
     pause_all_vcpus();