[Title] modified define

[Type] enhancement
[Module] Emulator
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 63fdba7fc902e52e1f719678aa91686fb317d06e..48a8d50c93ddd3fe17453a53fcc0a3dcacb47aec 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -14,9 +14,6 @@
  */
 
 
-#ifdef CONFIG_MARU
-#include "config-host.h"
-#endif
 #include <inttypes.h>
 
 #include "virtio.h"

diff --git a/tizen/src/skin/maruskin_client.h b/tizen/src/skin/maruskin_client.h
index bbde54266e16a80bd06546c9ad02dc20b780d546..945005af9c05b9053765d86caddacfd1ea693bc3 100644 (file)
--- a/tizen/src/skin/maruskin_client.h
+++ b/tizen/src/skin/maruskin_client.h
@@ -27,9 +27,12 @@
  *
  */
 
+
 #ifndef MARUSKIN_CLIENT_H_
 #define MARUSKIN_CLIENT_H_
 
+#include "../maru_common.h"
+
 #define JAVA_MAX_COMMAND_LENGTH 512
 
 #define JAR_SKINFILE_PATH "emulator-skin.jar"

diff --git a/vl.c b/vl.c
index e6e8d64661ec17bce2a429a4a0e9718bd4c372c5..0fe29357624866be7ce2ac108b639e7f83749aa3 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -263,7 +263,7 @@ int boot_splash_filedata_size;
 uint8_t qemu_extra_params_fw[2];
 
 //virtio-gl
-#ifndef CONFIG_DARWIN
+#if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
 extern int gl_acceleration_capability_check (void);
 int enable_gl = 0;
 int capability_check_gl = 0;
@@ -1792,7 +1792,7 @@ static int device_init_func(QemuOpts *opts, void *opaque)
 {
     DeviceState *dev;
 
-#ifndef CONFIG_DARWIN
+#if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
        // virtio-gl pci device
        if (!enable_gl) {
                // ignore virtio-gl-pci device, even if users set it in option.
@@ -2967,7 +2967,7 @@ fprintf(stdout, "kernel command : %s\n", kernel_cmdline);
                 qemu_opts_parse(olist, "accel=kvm", 0);
                 break;
                        case QEMU_OPTION_enable_gl:
-#ifndef CONFIG_DARWIN
+#if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
                                enable_gl = 1;
 #endif
                                break;
@@ -3223,7 +3223,7 @@ fprintf(stdout, "kernel command : %s\n", kernel_cmdline);
     }
     loc_set_none();
 
-#ifndef CONFIG_DARWIN
+#if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
     capability_check_gl = gl_acceleration_capability_check();
     if (enable_gl && (capability_check_gl != 0)) {
         enable_gl = 0;