[Title] Disable OpenGL module for building qemu on Windows.

[Type]
[Module] emulator / opengl
[Priority] Major
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 936da46..8fb8b9f 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -779,6 +779,7 @@ static int virtio_balloon_exit_pci(PCIDevice *pci_dev)
     return virtio_exit_pci(pci_dev);
 }
 
+#ifndef _WIN32\r
 extern VirtIODevice *virtio_gl_init(DeviceState *dev);
 static int virtio_gl_init_pci(PCIDevice *pci_dev)
 {
@@ -792,6 +793,7 @@ static int virtio_gl_init_pci(PCIDevice *pci_dev)
     virtio_init_pci(proxy, vdev);
     return 0;
 }
+#endif\r
 
 static PCIDeviceInfo virtio_info[] = {
     {
@@ -878,6 +880,7 @@ static PCIDeviceInfo virtio_info[] = {
         },
         .qdev.reset = virtio_pci_reset,
     },{
+#ifndef _WIN32\r
                .qdev.name = "virtio-gl-pci",
         .qdev.alias = "virtio-gl",
                .qdev.size = sizeof(VirtIOPCIProxy),
@@ -892,6 +895,7 @@ static PCIDeviceInfo virtio_info[] = {
                },
                .qdev.reset = virtio_pci_reset,
        },{
+#endif\r
         /* end of list */
     }
 };

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index bc914d3..1ddf1ec 100644 (file)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -22,6 +22,7 @@ else
 GL_CFLAGS := -Wall -g -O2 -fno-strict-aliasing
 endif
 
+ifndef CONFIG_WIN32\r
 ###########################################################
 ## Build openGL
 # i386
@@ -49,6 +50,7 @@ opengl_exec.o : opengl_exec.c server_stub.c opengl_func.h gl_beginend.h opengl_p
 
 endif #($(TARGET_ARCH), i386)
 ###########################################################
+endif #CONFIG_WIN32\r
        
 # maru loader
 obj-y += emulator.o emul_state.o process.o option.o maru_signal.o maru_sdl.o

diff --git a/vl.c b/vl.c
index 8ba96c7..3a57eb4 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -191,7 +191,6 @@ int qemu_main(int argc, char **argv, char **envp);
 
 #ifdef CONFIG_MARU
 #define VIRTIOGL_DEV_NAME "virtio-gl-pci"
-extern int gl_acceleration_capability_check (void);
 #endif
 
 static const char *data_dir;
@@ -255,7 +254,10 @@ int boot_splash_filedata_size;
 uint8_t qemu_extra_params_fw[2];
 
 //virtio-gl
+#ifndef _WIN32
+extern int gl_acceleration_capability_check (void);
 int enable_gl = 1;
+#endif
 
 typedef struct FWBootEntry FWBootEntry;
 
@@ -1760,6 +1762,7 @@ static int device_init_func(QemuOpts *opts, void *opaque)
 {
     DeviceState *dev;
 
+#ifndef _WIN32
        // virtio-gl pci device
        if (!enable_gl) {
                // ignore virtio-gl-pci device, even if users set it in option.
@@ -1768,6 +1771,7 @@ static int device_init_func(QemuOpts *opts, void *opaque)
                        return 0;
                }
        }
+#endif
        
     dev = qdev_device_add(opts);
     if (!dev)
@@ -2901,7 +2905,9 @@ int main(int argc, char **argv, char **envp)
                 qemu_opts_parse(olist, "accel=kvm", 0);
                 break;
                        case QEMU_OPTION_enable_gl:
+#ifndef _WIN32\r
                                enable_gl = 1;
+#endif\r
                                break;
             case QEMU_OPTION_machine:
                 olist = qemu_find_opts("machine");
@@ -3137,6 +3143,7 @@ int main(int argc, char **argv, char **envp)
     }
     loc_set_none();
 
+#ifndef _WIN32\r
        if (enable_gl && (gl_acceleration_capability_check () != 0)) {
                enable_gl = 0;
                fprintf (stderr, "Warn: GL acceleration was disabled due to the fail of GL check!\n");
@@ -3151,6 +3158,7 @@ int main(int argc, char **argv, char **envp)
                        }
                }
        }
+#endif\r
        
        
     /* Open the logfile at this point, if necessary. We can't open the logfile