[Title] added CONFIG_MARU define

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

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index bc14b53..63fdba7 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -13,6 +13,10 @@
  *
  */
 
+
+#ifdef CONFIG_MARU
+#include "config-host.h"
+#endif
 #include <inttypes.h>
 
 #include "virtio.h"
@@ -779,7 +783,7 @@ static int virtio_balloon_exit_pci(PCIDevice *pci_dev)
     return virtio_exit_pci(pci_dev);
 }
 
-#ifndef CONFIG_DARWIN
+#if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
 extern VirtIODevice *virtio_gl_init(DeviceState *dev);
 static int virtio_gl_init_pci(PCIDevice *pci_dev)
 {
@@ -880,7 +884,7 @@ static PCIDeviceInfo virtio_info[] = {
         },
         .qdev.reset = virtio_pci_reset,
     },{
-#ifndef CONFIG_DARWIN
+#if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
                .qdev.name = "virtio-gl-pci",
         .qdev.alias = "virtio-gl",
                .qdev.size = sizeof(VirtIOPCIProxy),

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index e8187e7..3093670 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -46,10 +46,13 @@
 #include "maruskin_operation.h"
 #include "qemu-thread.h"
 #include "emul_state.h"
-#include "maru_sdl.h"
 #include "maruskin_client.h"
 #include "emulator.h"
-#include "debug_ch.h"
+
+#ifndef USE_SHM
+#include "maru_sdl.h"
+#endif
+
 #ifdef CONFIG_WIN32
 #include <windows.h>
 #include <winsock2.h>
@@ -60,8 +63,11 @@
 #include <sys/socket.h>
 #endif
 
+#include "debug_ch.h"
+
 MULTI_DEBUG_CHANNEL(qemu, skin_server);
 
+
 #define MAX_REQ_ID 0x7fffffff
 #define RECV_BUF_SIZE 32
 #define RECV_HEADER_SIZE 12