]> xenbits.xensource.com Git - libvirt.git/commitdiff
domcaps: Report egl-headless graphics type
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 17 Nov 2020 10:00:26 +0000 (11:00 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Wed, 18 Nov 2020 08:42:16 +0000 (09:42 +0100)
QEMU supports egl-headless if QEMU_CAPS_EGL_HEADLESS capability
is present. There are some additional requirements but those are
checked for in qemuValidateDomainDeviceDefGraphics() and depend
on domain configuration and thus are not representable in domain
capabilities. Let's stick with plain qemuCaps check then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
57 files changed:
src/qemu/qemu_capabilities.c
tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml
tests/domaincapsdata/qemu_2.10.0.aarch64.xml
tests/domaincapsdata/qemu_2.10.0.ppc64.xml
tests/domaincapsdata/qemu_2.10.0.s390x.xml
tests/domaincapsdata/qemu_2.10.0.x86_64.xml
tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_2.11.0.s390x.xml
tests/domaincapsdata/qemu_2.11.0.x86_64.xml
tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
tests/domaincapsdata/qemu_2.12.0.aarch64.xml
tests/domaincapsdata/qemu_2.12.0.ppc64.xml
tests/domaincapsdata/qemu_2.12.0.s390x.xml
tests/domaincapsdata/qemu_2.12.0.x86_64.xml
tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_3.0.0.ppc64.xml
tests/domaincapsdata/qemu_3.0.0.s390x.xml
tests/domaincapsdata/qemu_3.0.0.x86_64.xml
tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_3.1.0.ppc64.xml
tests/domaincapsdata/qemu_3.1.0.x86_64.xml
tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
tests/domaincapsdata/qemu_4.0.0.aarch64.xml
tests/domaincapsdata/qemu_4.0.0.ppc64.xml
tests/domaincapsdata/qemu_4.0.0.s390x.xml
tests/domaincapsdata/qemu_4.0.0.x86_64.xml
tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_4.1.0.x86_64.xml
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
tests/domaincapsdata/qemu_4.2.0.aarch64.xml
tests/domaincapsdata/qemu_4.2.0.ppc64.xml
tests/domaincapsdata/qemu_4.2.0.s390x.xml
tests/domaincapsdata/qemu_4.2.0.x86_64.xml
tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
tests/domaincapsdata/qemu_5.0.0.aarch64.xml
tests/domaincapsdata/qemu_5.0.0.ppc64.xml
tests/domaincapsdata/qemu_5.0.0.x86_64.xml
tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_5.1.0.x86_64.xml
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
tests/domaincapsdata/qemu_5.2.0.x86_64.xml

index 58ab1beba67d864d5a0b3db92d1928c39990acf1..7745c968de847601ecbc0360ff3b1f96c740c78f 100644 (file)
@@ -5988,6 +5988,8 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPtr qemuCaps,
         VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_VNC);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE))
         VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SPICE);
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_EGL_HEADLESS))
+        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS);
 }
 
 
index be2840d9b8031bcd3a45f27358e90907606a08f1..be99698f09894b937176d91b77585a4aebf8f11a 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 1193f49bd65c4e157a9eefd887b6b730d6d0071b..31c096077dee68232927c411108bd9005d7433f4 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 4505d64e3ad5f75aca2c3dd34112c757fe4e7b52..bb509975ba797fc6d24ac28d37930f6ad5aad856 100644 (file)
@@ -92,6 +92,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 629833b74583ccd113c24026c6d59c3975506b40..f1f34d50240357d453a68288ff1d22fc1a5f8c33 100644 (file)
@@ -90,6 +90,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 863afbc0df38101b648ae41144d2ced80ddbce81..2741a73237260183531f9b8767bdb3a5cac832c6 100644 (file)
@@ -62,6 +62,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index ce5c92edce307fc9ef23e6dc5835eeecfb31e5ae..2e81779ad31d42a231cd442d0f361abe683da6ce 100644 (file)
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 6596016d33e84831f9bacd501c5d3d86cfd6c96e..81bef600a99ac6340ad728876cb301512a6901e1 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index c2e148e0fc5a32e622f87e897050baffe06fc61f..d11e499befda53bb0008bd2c8080d769d62ad616 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 7f66cf7b7e3af9b1359d994466c7b67fad214544..00056c714146427166148019fd3bbcd020e192fb 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index c5b48fdad50c5335d6bfb52c077b74c859c80579..684382d4c93cfbbe0296c912b6c503ff5443965d 100644 (file)
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 38b6b20f77e9fffaf8ffb1c4cb3ceb8e94ff6671..71ecbacaccbcc8d328b3fa12acf4a02a717618b3 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 8d38d33369de650d11cc68c95a35aa178d0fe519..dbd1bd4b1549c31463318ad9e7bd7215efe22522 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 9a895871159300582a7cfcd8afc9687a4fdb1f1d..4c867b18d019a5b632e40c62d34e7915afa8cc0c 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 8ea58bfa25cf56c625ad796517a62d500908ed22..58ebbe9cb84c5d778d5e41df61303e9f38b76c54 100644 (file)
@@ -94,6 +94,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 667516e75e24d74dea9a7d1b31de312633adbb56..5c96cc8d1e002d28a64d4db4bd87b6c510c9093d 100644 (file)
@@ -92,6 +92,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index eac3e6a86876334fcaf5814de5741e5adf54b3ee..1b12b9928f2545f7ce6af10c3c4dfb6677d66d19 100644 (file)
@@ -62,6 +62,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 01cc3d81ec96bd87669a04410adfa984803c458f..4df87a9a2f03f7b99f77c39aab3b8ccb74b4fc72 100644 (file)
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 6e006a3ba3758e8fa8db3cebc47cb7c1c0c2f056..81d50839595bb842755461dd046e882420cebef2 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index cd37906bc7c06811de30ab5a83873ae540b1aa7d..5b6e884403a58378fd99b5466733d311debc148e 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index d3211e7a139a7e2f5e0aaae1d5561ed4cac88b73..3a2fd5786a4c388b587e963e220c6ee8a9c960ff 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 1b8ddd4ed0a0116c37e56cb3d1a77e2f47378ecb..6250af9e67cf356d0a7a680f48af6cbd14d2dfbb 100644 (file)
@@ -62,6 +62,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 7a4e536fb56a1f806cd9378e9ed518b759975cb0..dfec6c5c19963c8d44bfc25d992eaa4054dc96a6 100644 (file)
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 9fa42247602e39af469bffe13e20edb0f2d9163d..56830014eac1817e0b7e84b8608c4d77abe1e854 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 82b1b6a0950b7ec523969091d89ebfc5ca0e5c67..a75c5775394ca0efa2bfef4b6d03b59db97f840b 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 756b28034e59d9cfb54e929d5b2b9f5103461bb4..e9e0cb9329a483ba37bf794aaa1a2cc83a47f4b7 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 6a2bc879477b9cfebbecc2d5c8f9f4c5f473a658..46226466d56bf26c1bd7ed7b69587c368dfc0247 100644 (file)
@@ -62,6 +62,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index ffc82f17c38ec696aa6cca3475e4797c96466c90..984be108334c1e05b5d07fde104b909e446f8b7e 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index c837de966f0f38d22ea691945eb05d75b28138f9..566b8ab281316f69458bc5a419aa13a7f338dfa4 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 0aa8aa18beebcc10d0eec1ab5d9561ba547a151d..643cc4a631075663e73d89e252450146ede1211b 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index f5347aba9f5f19d06fe13d75f08083f37093fa8b..b77a7e67bcad8a2f53ef1dde15dbdac7c4aea061 100644 (file)
@@ -97,6 +97,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index b879d7553c49096c74847beb356b607a436632cc..72ed2c90c55cdee4ecaeaa39951a000984bd77c2 100644 (file)
@@ -95,6 +95,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 0642753f111694925d66668217b971715b7cc654..4b1ec16992374c0a603cb71fe39dc6a6706e8f0e 100644 (file)
@@ -62,6 +62,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 632c26d68908f617d38ce1c86cc6f0eb7d070b5b..3ac97b0625828a6f1fd234adbb79138b1f02611b 100644 (file)
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 3f64bd4b66a42128a34fb6cd99543dbeb9852ecf..99d4a00a6abc6ee96565db4e107a89eb5304fb20 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 8bf41d6b49a828880b8d463fe4d41524ad4d76a1..3a7e01c8097897e57e638034ecbb303a31c4f958 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index d6265ce2437b2c9f9a2b0f093469add2c88acb37..bb1dacc14ceab48f7de09b136b533706843d269d 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 5010f879a64a4548d70f2643cc85ecc5ee861a6c..577b7f439dfa8646289c352ee782163dddfc50d3 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 6f72b67f682c77518d09d86be251deb5fe7abf2d..1a65f6e7273ab5fe69eee29310ca507aa14a2f63 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 7339a3f81c1e6f7f100730dbed521451882a57a6..622acc47a1f05c97cdf439adad3896f9915a9b0c 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index ef57216562d2cf86a0ec22a1b6e2eef9c0e24ee7..2d362f158210a087ec5ae7bf4f5ecf9f989912b3 100644 (file)
@@ -97,6 +97,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 3cf2a6faf15b8c1f01eb34f024e1648e0dbecf57..04bfba5196c9c55b2e726ab76f86ac8ba9143bd0 100644 (file)
@@ -95,6 +95,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 0f2cf6da640f30200a269dd30b09db0d5ca8c451..304b06b14e54f550578ab8a13d42655694ee754f 100644 (file)
@@ -62,6 +62,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index ecd037438a1f8050d36d9f79681776805d989c0c..7931dd41304dc921388cbb103711179d86212bcd 100644 (file)
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index f4a8321637e691d486a08d8134e7e5274de777ae..da9cf56ba57a642312f6d8eb2e862b6bcec7274b 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index d70c718b94a379af3b8cc5743659cef8337f325f..a42bec4d87688638a76c17ed78d4be4470c8f2b2 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 58f8547d3d190e6b4b07fa1acf457e89035d9dcc..40d691a62d3b0b4cf96e5c78a28a5a65242fb42d 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index b2b37c0f7b347986160afc3ad4df173bd382d02c..5fdc8d45d203207707c4bfc513888c5aa9bfeeb4 100644 (file)
@@ -98,6 +98,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 7377a2c4cf74acb9dfb2c5f5f3c71354a401d573..4a897d5e1eb52048a9a948302a69470d24d7d490 100644 (file)
@@ -96,6 +96,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 9693aeb72e68e68db5b50bd7dc54f578d9765b37..bedfae90e0239be622f2090957b058495fe42b11 100644 (file)
@@ -62,6 +62,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 587b49f55ca3f4881d7a8c533c694283f5e7fb10..57638696f8349fb27084c612ac21d06aa424d159 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index ed2da1f5daa8435231f1b3e5f5d5ce2354943ad3..9fba7f33ab0fc2cf00b5b878c639738b31a53758 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 669afdbec8a6470acc57703fb19f9a6368d9e2b9..21db6a084a1662afeadf1a1d843c86b829e0907f 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 4379ec351d83f6bbe9c03d90d6ed2407d6561384..1984ed2e07788bc1ccf26e07c355536c7d6d60a3 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 7fa021fcbac0b2c3574f1cea2b5399fc35df59ce..5a3777f6f8d2a524442a8131498501332e6b8d73 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index b5c9b31da7b254a2b9c31d293b4a968c3026bcd2..ad10e7b8fdd7b890cac907a1faa71efc15f99245 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>
index 953c18a251ec984191e685e124462b3ee652c7ef..ab6455c3fccc32c559ba68e42957fba4cf651681 100644 (file)
         <value>sdl</value>
         <value>vnc</value>
         <value>spice</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported='yes'>