qemu: Add QEMU_CAPS_SDL_GL to qemu capabilities

Support OpenGL acceleration capability when using SDL graphics.
Signed-off-by: NMaciej Wolny <maciej.wolny@codethink.co.uk>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>

src/qemu/qemu_capabilities.c

@@ -483,6 +483,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "virtual-css-bridge",
               "virtual-css-bridge.cssid-unrestricted",
               "vfio-ccw",
+
+              /* 300 */
+              "sdl-gl",
     );
 
 
@@ -3862,6 +3865,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
     if (qemuCaps->version >= 2004000)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
 
+    /* sdl -gl option is supported from v2.4.0 (qemu commit id 0b71a5d5) */
+    if (qemuCaps->version >= 2004000)
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);
+
     /* Since 2.4.50 ARM virt machine supports gic-version option */
     if (qemuCaps->version >= 2004050)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);

src/qemu/qemu_capabilities.h

@@ -468,6 +468,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */
     QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */
 
+    /* 300 */
+    QEMU_CAPS_SDL_GL, /* -sdl gl */
+
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
 

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -154,6 +154,7 @@
   <flag name='qcow2-luks'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>303541</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -153,6 +153,7 @@
   <flag name='qcow2-luks'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>382824</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -115,6 +115,7 @@
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='virtual-css-bridge'/>
+  <flag name='sdl-gl'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>303434</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -196,6 +196,7 @@
   <flag name='qcow2-luks'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>344938</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -121,6 +121,7 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='virtual-css-bridge'/>
+  <flag name='sdl-gl'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>342166</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -161,6 +161,7 @@
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
+  <flag name='sdl-gl'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>343099</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -158,6 +158,7 @@
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
+  <flag name='sdl-gl'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>419968</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -126,6 +126,7 @@
   <flag name='virtual-css-bridge'/>
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
+  <flag name='sdl-gl'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -199,6 +199,7 @@
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
+  <flag name='sdl-gl'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>390813</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -153,6 +153,7 @@
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='isa-serial'/>
+  <flag name='sdl-gl'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>75406</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -159,6 +159,7 @@
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='isa-serial'/>
+  <flag name='sdl-gl'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>216528</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -141,6 +141,7 @@
   <flag name='pl011'/>
   <flag name='dump-completed'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>228241</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -136,6 +136,7 @@
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>263005</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -171,6 +171,7 @@
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>227332</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -105,6 +105,7 @@
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='virtual-css-bridge'/>
+  <flag name='sdl-gl'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>216840</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -176,6 +176,7 @@
   <flag name='dump-completed'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>239029</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -107,6 +107,7 @@
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='virtual-css-bridge'/>
+  <flag name='sdl-gl'/>
   <version>2007093</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>241741</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -178,6 +178,7 @@
   <flag name='dump-completed'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>255684</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -145,6 +145,7 @@
   <flag name='dump-completed'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>346538</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -110,6 +110,7 @@
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='virtual-css-bridge'/>
+  <flag name='sdl-gl'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>265159</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -191,6 +191,7 @@
   <flag name='dump-completed'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
+  <flag name='sdl-gl'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>320947</microcodeVersion>