virtio-gl: Additional merge of virtio-gl.

Change-Id: I94dfd1368fc48a191aaf477ee95cb8c6f7488db8
Signed-off-by: Sangjin Kim <sangjin3.kim@samsung.com>

diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h
index 251cf92..d416670 100644 (file)
--- a/include/exec/hwaddr.h
+++ b/include/exec/hwaddr.h
@@ -9,6 +9,10 @@
 /* hwaddr is the type of a physical address (its size can
    be different from 'target_ulong').  */
 
+#ifdef CONFIG_MARU
+#include <inttypes.h>
+#endif //CONFIG_MARU
+
 typedef uint64_t hwaddr;
 #define HWADDR_MAX UINT64_MAX
 #define TARGET_FMT_plx "%016" PRIx64

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index e5b41d1..d8045b7 100644 (file)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -142,8 +142,8 @@ obj-y += guest_server.o
 #ifndef CONFIG_DARWIN
 ###########################################################
 ## opengl library for i386
-#obj-$(CONFIG_GL) += virtio-gl.o 
-#obj-$(CONFIG_GL) += helper_opengl.o opengl_exec.o mesa_mipmap.o
+obj-$(CONFIG_GL) += virtio-gl.o 
+obj-$(CONFIG_GL) += helper_opengl.o opengl_exec.o mesa_mipmap.o
 obj-$(CONFIG_NO_GL) += virtio-gl-stub.o 
 obj-y += gloffscreen_test.o gloffscreen_xcomposite.o gloffscreen_common.o gloffscreen_wgl.o gloffscreen_agl.o
 ###########################################################

diff --git a/tizen/src/hw/helper_opengl.c b/tizen/src/hw/helper_opengl.c
index c09b914..ea76d60 100644 (file)
--- a/tizen/src/hw/helper_opengl.c
+++ b/tizen/src/hw/helper_opengl.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "osdep.h"
+#include "qemu/osdep.h"
 #include "opengl_func.h"
 #include "opengl_process.h"
 #include "opengl_exec.h"

diff --git a/tizen/src/hw/opengl_exec.c b/tizen/src/hw/opengl_exec.c
index 09cb146..c4ac435 100644 (file)
--- a/tizen/src/hw/opengl_exec.c
+++ b/tizen/src/hw/opengl_exec.c
@@ -56,7 +56,7 @@ MULTI_DEBUG_CHANNEL(qemu, opengl);
 #define GLX_GLXEXT_PROTOTYPES
 #include <mesa_gl.h>
 
-#include "qemu-queue.h"
+//#include "qemu-queue.h"
 #include "opengl_func.h"
 #include "mesa_mipmap.h"
 #include "opengl_process.h"

diff --git a/tizen/src/hw/opengl_func.h b/tizen/src/hw/opengl_func.h
index e29f0d9..d48fe2c 100644 (file)
--- a/tizen/src/hw/opengl_func.h
+++ b/tizen/src/hw/opengl_func.h
@@ -29,6 +29,7 @@
 
 #include "mesa_gl.h"
 #include "mesa_glext.h"
+#include "exec/hwaddr.h"
 
 #ifdef TARGET_X86_64
 #define TARGET_LONG_BITS 64
@@ -41,11 +42,12 @@
 //#define NEED_CPU_H
 //#include "exec.h"  // For arg_t typedef
 //#undef NEED_CPU_H
-#include "targphys.h"
+//#include "targphys.h"
 
 /* Argument list are internally of a type that can hold a target pointer
  * or a host pointer.  */
-typedef target_phys_addr_t arg_t;
+//typedef target_phys_addr_t arg_t;
+typedef hwaddr arg_t;
 
 enum {
     TYPE_NONE,

diff --git a/tizen/src/hw/virtio-gl.h b/tizen/src/hw/virtio-gl.h
index ae00b10..5f96656 100644 (file)
--- a/tizen/src/hw/virtio-gl.h
+++ b/tizen/src/hw/virtio-gl.h
@@ -7,8 +7,9 @@ extern "C" {
 
 #include "hw/hw.h"
 #include "maru_device_ids.h"
+#include "hw/virtio/virtio.h"
+#include "exec/hwaddr.h"
 
-//typedef target_phys_addr_t arg_t;
 #include "opengl_process.h"
 #include "opengl_exec.h"
 #include <sys/time.h>
@@ -18,6 +19,7 @@ MULTI_DEBUG_CHANNEL(qemu, virtio-gl);
 
 #define TYPE_VIRTIO_GL "virtio-gl"
 
+typedef hwaddr arg_t;
 int decode_call_int(ProcessStruct *p, char *in_args, int args_len, char *r_buffer);
 
 /* Uncomment to enable debugging - WARNING!!! changes ABI! */