Merge tag 'v2.4.0' into tizen_3.0_qemu_2.4

[sdk/emulator/qemu.git] / include / sysemu / sysemu.h

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 44570d1..69ac4df 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -99,6 +99,16 @@ typedef enum DisplayType
     DT_SDL,
     DT_GTK,
     DT_NOGRAPHIC,
+#ifdef CONFIG_MARU
+# ifdef CONFIG_JAVA_UI
+    DT_MARU_SDL,
+    DT_MARU_SHM,
+# endif
+# ifdef CONFIG_QT
+    DT_MARU_QT_ONSCREEN,
+    DT_MARU_QT_OFFSCREEN,
+# endif
+#endif
     DT_NONE,
 } DisplayType;
 
@@ -106,7 +116,11 @@ extern int autostart;
 
 typedef enum {
     VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
+<<<<<<< HEAD
+    VGA_TCX, VGA_CG3, VGA_DEVICE,
+=======
     VGA_TCX, VGA_CG3, VGA_DEVICE, VGA_VIRTIO,
+>>>>>>> v2.4.0
 } VGAInterfaceType;
 
 extern int vga_interface_type;