Merge branch 'develop' of http://121.133.176.49/review/p/sdk/emulator/qemu into tizen-arm

Conflicts:
	vl.c

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>

diff --cc configure
Simple merge

diff --cc tizen/emulator_configure.sh
Simple merge

diff --cc tizen/src/Makefile.tizen
index d1bb9f5d4ed50ccbc5814e8b8acdad9c9f33751f,40e005ae3d4769640131f70ab1b819f9fb99cce3..e678bbd074ea0bdeb7de15b83b1e72e5d2bfb6f8
--- 1/tizen/src/Makefile.tizen
--- 2/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@@ -64,8 -65,25 +65,8 @@@ opengl_exec.o : opengl_exec.c server_st
  
  endif #CONFIG_GL
  
 -ifdef CONFIG_OPENGLES
 -
 -parse_gl_h: parse_gl_h.c
 -      $(CC) -g -o $@ $<
 -
 -gl_mangled.h: parse_gl_h
 -      ./parse_gl_h mangle 2>/dev/null
 -
 -gl_mangled.c: gl_mangled.h
 -      ./parse_gl_h mangle 2>/dev/null
 -
 -gloffscreen_glx.o gloffscreen_wgl.o gloffscreen_xcomposite.o: gl_mangled.h
 -maru_sdl.o gloffscreen_test.o gloffscreen_common.o: gl_mangled.h
 -
 -obj-y += gl_mangled.o
 -
 -endif #CONFIG_OPENGLES
  ###########################################################
- endif #!CONFIG_DARWIN
+ #endif #!CONFIG_DARWIN
  
  # maru loader
  obj-y += emulator.o emul_state.o option.o maru_err_table.o

diff --cc tizen/src/hw/gloffscreen_common.c
Simple merge

diff --cc tizen/src/hw/gloffscreen_test.c
Simple merge

diff --cc tizen/src/hw/gloffscreen_xcomposite.c
Simple merge

diff --cc vl.c
index bd322383afb2889e21fac4e9b9c0931a7f10862a,10fff6a1fd575bc78f5f41f52435238c97251343..50183ffc06c41585897a16932dac96ca4751130d
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c
@@@ -262,10 -262,9 +262,10 @@@ uint8_t qemu_extra_params_fw[2]
  
  //virtio-gl
  #define VIRTIOGL_DEV_NAME "virtio-gl-pci"
- #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
+ #if defined(CONFIG_MARU)
  extern int gl_acceleration_capability_check(void);
  int enable_gl = 0;
 +int enable_yagl = 0;
  int capability_check_gl = 0;
  #endif
  #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
@@@ -3504,13 -3503,9 +3504,13 @@@ int main(int argc, char **argv, char **
          exit(0);
      }
  
- #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
 -#ifdef CONFIG_GL_BACKEND
+ #if defined(CONFIG_MARU)
 -    if (enable_gl) {
 +    if (enable_gl && enable_yagl) {
 +        fprintf (stderr, "Error: only one openGL passthrough device can be used at one time!\n");
 +        exit(1);
 +    }
 +
 +    if (enable_gl || enable_yagl) {
          capability_check_gl = gl_acceleration_capability_check();
  
          if (capability_check_gl != 0) {