From e39fc0b88fb99018819129bd3dea9395e9c73071 Mon Sep 17 00:00:00 2001
From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Mon, 21 Apr 2014 16:03:05 +0900
Subject: [PATCH] vigs: fix compilation errors

1. Some qemu function prototype modification.
graphic_console_init()
qemu_thread_create()

2. A "work_queue.c" is moved to "vigs".

Change-Id: I066734b08bb8ad59aeb5afb67049065048bcdd63
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---
 hw/Makefile.objs           | 1 -
 hw/vigs/Makefile.objs      | 1 +
 hw/vigs/vigs_device.c      | 2 +-
 hw/vigs/vigs_gl_backend.c  | 2 +-
 hw/{ => vigs}/work_queue.c | 4 ++--
 hw/{ => vigs}/work_queue.h | 2 +-
 hw/yagl/yagl_thread.c      | 1 -
 hw/yagl/yagl_thread.h      | 2 +-
 tizen/src/hw/maru_board.c  | 2 +-
 9 files changed, 8 insertions(+), 9 deletions(-)
 rename hw/{ => vigs}/work_queue.c (95%)
 rename hw/{ => vigs}/work_queue.h (93%)

diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index fce7734787..a6ac525e0e 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -34,4 +34,3 @@ devices-dirs-$(CONFIG_BUILD_VIGS) += vigs/
 devices-dirs-y += core/
 common-obj-y += $(devices-dirs-y)
 obj-y += $(devices-dirs-y)
-obj-y += work_queue.o
diff --git a/hw/vigs/Makefile.objs b/hw/vigs/Makefile.objs
index d2c4353d9f..ab8ef51f39 100644
--- a/hw/vigs/Makefile.objs
+++ b/hw/vigs/Makefile.objs
@@ -14,6 +14,7 @@ obj-y += vigs_fenceman.o
 obj-y += vigs_gl_pool.o
 obj-y += vigs_gl_backend.o
 obj-y += vigs_sw_backend.o
+obj-y += work_queue.o
 # GL GLX backend
 ifdef CONFIG_LINUX
 obj-y += vigs_gl_backend_glx.o
diff --git a/hw/vigs/vigs_device.c b/hw/vigs/vigs_device.c
index 3f66f1b40b..3769bade7a 100644
--- a/hw/vigs/vigs_device.c
+++ b/hw/vigs/vigs_device.c
@@ -340,7 +340,7 @@ static int vigs_device_init(PCIDevice *dev)
 
     s->fence_ack_bh = qemu_bh_new(vigs_fence_ack_bh, s);
 
-    s->con = graphic_console_init(DEVICE(dev), &vigs_hw_ops, s);
+    s->con = graphic_console_init(DEVICE(dev), 0, &vigs_hw_ops, s);
 
     if (!s->con) {
         goto fail;
diff --git a/hw/vigs/vigs_gl_backend.c b/hw/vigs/vigs_gl_backend.c
index 0e16603ae4..720e6186ff 100644
--- a/hw/vigs/vigs_gl_backend.c
+++ b/hw/vigs/vigs_gl_backend.c
@@ -1587,7 +1587,7 @@ bool vigs_gl_backend_init(struct vigs_gl_backend *gl_backend)
     vigs_vector_init(&gl_backend->v1, 0);
     vigs_vector_init(&gl_backend->v2, 0);
 
-    gl_backend->read_pixels_queue = work_queue_create();
+    gl_backend->read_pixels_queue = work_queue_create("vigs_work_queue");
 
     return true;
 
diff --git a/hw/work_queue.c b/hw/vigs/work_queue.c
similarity index 95%
rename from hw/work_queue.c
rename to hw/vigs/work_queue.c
index af5b8a58f0..1bc53facce 100644
--- a/hw/work_queue.c
+++ b/hw/vigs/work_queue.c
@@ -44,7 +44,7 @@ void work_queue_item_init(struct work_queue_item *wq_item,
     wq_item->func = func;
 }
 
-struct work_queue *work_queue_create(void)
+struct work_queue *work_queue_create(const char *name)
 {
     struct work_queue *wq;
 
@@ -56,7 +56,7 @@ struct work_queue *work_queue_create(void)
 
     QTAILQ_INIT(&wq->items);
 
-    qemu_thread_create(&wq->thread,
+    qemu_thread_create(&wq->thread, name,
                        work_queue_run,
                        wq,
                        QEMU_THREAD_JOINABLE);
diff --git a/hw/work_queue.h b/hw/vigs/work_queue.h
similarity index 93%
rename from hw/work_queue.h
rename to hw/vigs/work_queue.h
index a08efcad03..af27ee2a33 100644
--- a/hw/work_queue.h
+++ b/hw/vigs/work_queue.h
@@ -33,7 +33,7 @@ struct work_queue
 void work_queue_item_init(struct work_queue_item *wq_item,
                           work_queue_func func);
 
-struct work_queue *work_queue_create(void);
+struct work_queue *work_queue_create(const char *name);
 
 void work_queue_add_item(struct work_queue *wq,
                          struct work_queue_item *wq_item);
diff --git a/hw/yagl/yagl_thread.c b/hw/yagl/yagl_thread.c
index ff3206a4b0..729e019d95 100644
--- a/hw/yagl/yagl_thread.c
+++ b/hw/yagl/yagl_thread.c
@@ -35,7 +35,6 @@
 #include "yagl_stats.h"
 #include "yagl_transport.h"
 #include "yagl_object_map.h"
-#include "work_queue.h"
 #include "winsys.h"
 #include "sysemu/kvm.h"
 #include "sysemu/hax.h"
diff --git a/hw/yagl/yagl_thread.h b/hw/yagl/yagl_thread.h
index 21cfc0c57d..928c905167 100644
--- a/hw/yagl/yagl_thread.h
+++ b/hw/yagl/yagl_thread.h
@@ -33,7 +33,7 @@
 #include "yagl_types.h"
 #include "yagl_event.h"
 #include "yagl_tls.h"
-#include "work_queue.h"
+#include "vigs/work_queue.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"
 
diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index 7635aaeff9..9fb64cae7c 100644
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -75,7 +75,7 @@
 #include <X11/Xlib.h>
 #endif
 #include "vigs/vigs_device.h"
-#include "work_queue.h"
+#include "vigs/work_queue.h"
 extern int enable_yagl;
 extern const char *yagl_backend;
 extern int enable_vigs;
-- 
2.34.1