configure: Change CONFIG_VIRTIO_GL to CONFIG_GL_BACKEND

CONFIG_GL_BACKEND is for host
CONFIG_GL is for target

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

diff --git a/configure b/configure
index 41e42e205be5bc3f7eab6e4f1c0d67a7ea9ee39d..f04b8559b0559d1f41b3987d3ff6f87c6413163c 100755 (executable)
--- a/configure
+++ b/configure
@@ -3659,11 +3659,11 @@ fi
 #
 if test "$gl" = "yes" ; then
   if test "$mingw32" = "yes" ; then
-    echo "CONFIG_VIRTIO_GL=y" >> $config_host_mak
+    echo "CONFIG_GL_BACKEND=y" >> $config_host_mak
 #    echo "ERROR: Virtio GL not supported for Windows"
 #    gl="no"
   else
-    echo "CONFIG_VIRTIO_GL=y" >> $config_host_mak
+    echo "CONFIG_GL_BACKEND=y" >> $config_host_mak
   fi
 fi
 # use default implementation for tracing backend-specific routines

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index d6ec58bafc60386331cc9963de42f86895d2f572..2ce1a9ac934f61752a7af8acce3e757d314e186d 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -884,7 +884,7 @@ static void virtio_balloon_exit_pci(PCIDevice *pci_dev)
     virtio_exit_pci(pci_dev);
 }
 
-#ifdef CONFIG_VIRTIO_GL
+#ifdef CONFIG_GL_BACKEND
 #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
 static int virtio_gl_init_pci(PCIDevice *pci_dev)
 {
@@ -1113,7 +1113,7 @@ static TypeInfo virtio_scsi_info = {
 };
 
 #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
-#ifdef CONFIG_VIRTIO_GL
+#ifdef CONFIG_GL_BACKEND
 static void virtio_gl_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -1167,7 +1167,7 @@ static void virtio_pci_register_types(void)
     type_register_static(&virtio_serial_info);
     type_register_static(&virtio_balloon_info);
     type_register_static(&virtio_scsi_info);
-#ifdef CONFIG_VIRTIO_GL
+#ifdef CONFIG_GL_BACKEND
     type_register_static(&virtio_gl_info);
 #endif
 #ifdef CONFIG_MARU

diff --git a/hw/virtio.h b/hw/virtio.h
index d503f805b2782f3ae836207475641e3809a485c7..43d02bc1eb32d772e475a13f4dd549f179c0dffb 100644 (file)
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -206,7 +206,7 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *conf);
 #ifdef CONFIG_LINUX
 VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf);
 #endif
-#ifdef CONFIG_VIRTIO_GL
+#ifdef CONFIG_GL_BACKEND
 VirtIODevice *virtio_gl_init(DeviceState *dev);
 #endif
 

diff --git a/vl.c b/vl.c
index c561ba4f7ca319017f584d2103bc5288a2ba5b69..d622b27ee597f8575445475e52ad3ebc1dba36d0 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -1976,7 +1976,7 @@ static int device_init_func(QemuOpts *opts, void *opaque)
 {
     DeviceState *dev;
 
-#ifdef CONFIG_VIRTIO_GL
+#ifdef CONFIG_GL_BACKEND
 #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
        // virtio-gl pci device
        if (!enable_gl) {
@@ -3195,7 +3195,7 @@ int main(int argc, char **argv, char **envp)
                 qemu_opts_parse(olist, "accel=kvm", 0);
                 break;
            case QEMU_OPTION_enable_gl:
-#ifdef CONFIG_VIRTIO_GL
+#ifdef CONFIG_GL_BACKEND
 #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
                 enable_gl = 1;
 #endif
@@ -3497,7 +3497,7 @@ int main(int argc, char **argv, char **envp)
         exit(0);
     }
 
-#ifdef CONFIG_VIRTIO_GL
+#ifdef CONFIG_GL_BACKEND
 #if defined(CONFIG_MARU) && (!defined(CONFIG_DARWIN))
     if (enable_gl) {
         capability_check_gl = gl_acceleration_capability_check();