[v1] Add qemu RDP server support

[PATCH 16/19] qemu: if -display dbus capability is supported, accept rdp

Posted by marcandre.lureau@redhat.com 7 months, 1 week ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

We may want to check qemu-rdp presence, instead of failing later?

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 src/qemu/qemu_capabilities.c                             | 7 +++++--
 tests/domaincapsdata/qemu_10.0.0.s390x.xml               | 1 +
 tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml       | 1 +
 tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml       | 1 +
 tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_7.2.0.ppc.xml                  | 1 +
 tests/domaincapsdata/qemu_7.2.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_8.0.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_8.1.0.s390x.xml                | 1 +
 tests/domaincapsdata/qemu_8.1.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml | 1 +
 tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml         | 1 +
 tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml     | 1 +
 tests/domaincapsdata/qemu_8.2.0.aarch64.xml              | 1 +
 tests/domaincapsdata/qemu_8.2.0.armv7l.xml               | 1 +
 tests/domaincapsdata/qemu_8.2.0.s390x.xml                | 1 +
 tests/domaincapsdata/qemu_8.2.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_9.0.0.sparc.xml                | 1 +
 tests/domaincapsdata/qemu_9.0.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml     | 1 +
 tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml         | 1 +
 tests/domaincapsdata/qemu_9.1.0.s390x.xml                | 1 +
 tests/domaincapsdata/qemu_9.1.0.x86_64.xml               | 1 +
 tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml           | 1 +
 tests/domaincapsdata/qemu_9.2.0.s390x.xml                | 1 +
 tests/domaincapsdata/qemu_9.2.0.x86_64.xml               | 1 +
 44 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 490f5b28fd..43669aa27d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6497,8 +6497,11 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCaps *qemuCaps,
         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);
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS))
-        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_DBUS);
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) {
+        VIR_DOMAIN_CAPS_ENUM_SET(dev->type,
+                                 VIR_DOMAIN_GRAPHICS_TYPE_DBUS,
+                                 VIR_DOMAIN_GRAPHICS_TYPE_RDP);
+    }
 }
 
 
diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
index 4af3c7ec53..d66240307e 100644
--- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml
@@ -253,6 +253,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>egl-headless</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 2c5129453e..8fa50785b7 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -1050,6 +1050,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index d4a567f5c6..2686989d64 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1849,6 +1849,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 6fa08af994..6ab3774452 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -1050,6 +1050,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 8bed31ad22..75565c4495 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -1017,6 +1017,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index cb7fd8811b..4e44dbaf65 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1797,6 +1797,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index a0f8b13f72..898b081df0 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -1017,6 +1017,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
index 75b2f1102d..ad89db56d8 100644
--- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml
@@ -74,6 +74,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index f9d27024fc..cfbe7e5dd1 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -1022,6 +1022,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index c7728ac454..805a636ec6 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -1502,6 +1502,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index c7728ac454..805a636ec6 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1502,6 +1502,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml
index c6ef37b1af..21dbe730c5 100644
--- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml
@@ -65,6 +65,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index f0d9493353..2b402f59c8 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -1022,6 +1022,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index b8c376cb14..c1f7b96465 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -1104,6 +1104,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index d3c9830a1a..4d8d4c7702 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1597,6 +1597,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index e8df30ae07..7db506386c 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -1104,6 +1104,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index e80e175376..4c9b674c1e 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1363,6 +1363,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index 62ffabb3e2..52f0d339bb 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1619,6 +1619,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
index 2ca3b1d2ae..be8bb70245 100644
--- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
@@ -342,6 +342,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>egl-headless</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 4117d926cb..8389909b74 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1363,6 +1363,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index dfa88bcf96..dcb46e06ea 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1364,6 +1364,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
index c9f01904cd..18979cf280 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml
@@ -72,6 +72,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 327cad253e..fae61e8955 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1585,6 +1585,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
index 224c619168..ce17865e24 100644
--- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
@@ -120,6 +120,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>egl-headless</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
index ed3637eaec..8f4ebbc107 100644
--- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml
@@ -76,6 +76,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
index 224c619168..ce17865e24 100644
--- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
@@ -120,6 +120,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>egl-headless</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
index 7182dca796..ee653c0c49 100644
--- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml
@@ -69,6 +69,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
index 57ac07c153..78f91736d6 100644
--- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
@@ -342,6 +342,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>egl-headless</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index f8dbb717f1..97b3795b5a 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1364,6 +1364,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index c5a653f57b..d55bc239a9 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1364,6 +1364,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index 30876c5fef..48300b14f5 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1514,6 +1514,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.0.0.sparc.xml b/tests/domaincapsdata/qemu_9.0.0.sparc.xml
index e48cdd0ae5..c7862f5842 100644
--- a/tests/domaincapsdata/qemu_9.0.0.sparc.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.sparc.xml
@@ -60,6 +60,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 6c141e1cb9..52f01a7cfc 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1364,6 +1364,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index 9445d999b5..5449244329 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1500,6 +1500,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
index b4327bf878..b236ecbac4 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
@@ -82,6 +82,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 61d92550c1..927a5a6d36 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1619,6 +1619,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
index 73e5ba1bc3..1399b980fd 100644
--- a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml
@@ -71,6 +71,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
index be46cfe6ba..b73e0d0688 100644
--- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml
@@ -205,6 +205,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>egl-headless</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 5e87efe5e8..dc2521135c 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1500,6 +1500,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index 98c522f0fc..49f5e64bfa 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1558,6 +1558,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index 7ccdc11412..884228db72 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1666,6 +1666,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
index e13809bc63..605a3af5c7 100644
--- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml
@@ -205,6 +205,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>egl-headless</value>
         <value>dbus</value>
       </enum>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 0b5162781e..d587c1316a 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1558,6 +1558,7 @@
       <enum name='type'>
         <value>sdl</value>
         <value>vnc</value>
+        <value>rdp</value>
         <value>spice</value>
         <value>egl-headless</value>
         <value>dbus</value>
-- 
2.47.0

Re: [PATCH 16/19] qemu: if -display dbus capability is supported, accept rdp

Posted by Daniel P. Berrangé 6 months, 4 weeks ago

On Wed, Jan 29, 2025 at 05:40:38PM +0400, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> We may want to check qemu-rdp presence, instead of failing later?

Yes, we should validate qemu-rdp, because the capabilities get
advertized to client apps in domain capabilities, as well as
being the thing that checks XML configs in qemuDomainValidate.
So if qemu-rdp is missing, we must not claim the capabilty.

> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  src/qemu/qemu_capabilities.c                             | 7 +++++--
>  tests/domaincapsdata/qemu_10.0.0.s390x.xml               | 1 +
>  tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_7.0.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_7.1.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml       | 1 +
>  tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml       | 1 +
>  tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_7.2.0.ppc.xml                  | 1 +
>  tests/domaincapsdata/qemu_7.2.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_8.0.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_8.1.0.s390x.xml                | 1 +
>  tests/domaincapsdata/qemu_8.1.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml | 1 +
>  tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml         | 1 +
>  tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml     | 1 +
>  tests/domaincapsdata/qemu_8.2.0.aarch64.xml              | 1 +
>  tests/domaincapsdata/qemu_8.2.0.armv7l.xml               | 1 +
>  tests/domaincapsdata/qemu_8.2.0.s390x.xml                | 1 +
>  tests/domaincapsdata/qemu_8.2.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_9.0.0.sparc.xml                | 1 +
>  tests/domaincapsdata/qemu_9.0.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml     | 1 +
>  tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml         | 1 +
>  tests/domaincapsdata/qemu_9.1.0.s390x.xml                | 1 +
>  tests/domaincapsdata/qemu_9.1.0.x86_64.xml               | 1 +
>  tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml           | 1 +
>  tests/domaincapsdata/qemu_9.2.0.s390x.xml                | 1 +
>  tests/domaincapsdata/qemu_9.2.0.x86_64.xml               | 1 +
>  44 files changed, 48 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 490f5b28fd..43669aa27d 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -6497,8 +6497,11 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCaps *qemuCaps,
>          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);
> -    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS))
> -        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_DBUS);
> +    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) {
> +        VIR_DOMAIN_CAPS_ENUM_SET(dev->type,
> +                                 VIR_DOMAIN_GRAPHICS_TYPE_DBUS,
> +                                 VIR_DOMAIN_GRAPHICS_TYPE_RDP);
> +    }
>  }


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH 16/19] qemu: if -display dbus capability is supported, accept rdp

Posted by Marc-André Lureau 6 months, 3 weeks ago

Hi

On Wed, Feb 12, 2025 at 8:21 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Wed, Jan 29, 2025 at 05:40:38PM +0400, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > We may want to check qemu-rdp presence, instead of failing later?
>
> Yes, we should validate qemu-rdp, because the capabilities get
> advertized to client apps in domain capabilities, as well as
> being the thing that checks XML configs in qemuDomainValidate.
> So if qemu-rdp is missing, we must not claim the capabilty.

Afaik, libvirt advertises capability for features that require
external process support: swtpm, passt, various helpers.. Do you think
we should also correct those?

>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> >  src/qemu/qemu_capabilities.c                             | 7 +++++--
> >  tests/domaincapsdata/qemu_10.0.0.s390x.xml               | 1 +
> >  tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_7.0.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_7.1.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml       | 1 +
> >  tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml       | 1 +
> >  tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_7.2.0.ppc.xml                  | 1 +
> >  tests/domaincapsdata/qemu_7.2.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_8.0.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_8.1.0.s390x.xml                | 1 +
> >  tests/domaincapsdata/qemu_8.1.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml | 1 +
> >  tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml         | 1 +
> >  tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml     | 1 +
> >  tests/domaincapsdata/qemu_8.2.0.aarch64.xml              | 1 +
> >  tests/domaincapsdata/qemu_8.2.0.armv7l.xml               | 1 +
> >  tests/domaincapsdata/qemu_8.2.0.s390x.xml                | 1 +
> >  tests/domaincapsdata/qemu_8.2.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_9.0.0.sparc.xml                | 1 +
> >  tests/domaincapsdata/qemu_9.0.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml     | 1 +
> >  tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml         | 1 +
> >  tests/domaincapsdata/qemu_9.1.0.s390x.xml                | 1 +
> >  tests/domaincapsdata/qemu_9.1.0.x86_64.xml               | 1 +
> >  tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml           | 1 +
> >  tests/domaincapsdata/qemu_9.2.0.s390x.xml                | 1 +
> >  tests/domaincapsdata/qemu_9.2.0.x86_64.xml               | 1 +
> >  44 files changed, 48 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> > index 490f5b28fd..43669aa27d 100644
> > --- a/src/qemu/qemu_capabilities.c
> > +++ b/src/qemu/qemu_capabilities.c
> > @@ -6497,8 +6497,11 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCaps *qemuCaps,
> >          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);
> > -    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS))
> > -        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_DBUS);
> > +    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) {
> > +        VIR_DOMAIN_CAPS_ENUM_SET(dev->type,
> > +                                 VIR_DOMAIN_GRAPHICS_TYPE_DBUS,
> > +                                 VIR_DOMAIN_GRAPHICS_TYPE_RDP);
> > +    }
> >  }
>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
>

Re: [PATCH 16/19] qemu: if -display dbus capability is supported, accept rdp

Posted by Marc-André Lureau 6 months, 3 weeks ago

Hi

On Fri, Feb 14, 2025 at 4:03 PM Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> Hi
>
> On Wed, Feb 12, 2025 at 8:21 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > On Wed, Jan 29, 2025 at 05:40:38PM +0400, marcandre.lureau@redhat.com wrote:
> > > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> > >
> > > We may want to check qemu-rdp presence, instead of failing later?
> >
> > Yes, we should validate qemu-rdp, because the capabilities get
> > advertized to client apps in domain capabilities, as well as
> > being the thing that checks XML configs in qemuDomainValidate.
> > So if qemu-rdp is missing, we must not claim the capabilty.
>
> Afaik, libvirt advertises capability for features that require
> external process support: swtpm, passt, various helpers.. Do you think
> we should also correct those?

Actually, there is some check for swtpm, but not for passt. I'll add
one for qemu-rdp.

>
> >
> > >
> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > > ---
> > >  src/qemu/qemu_capabilities.c                             | 7 +++++--
> > >  tests/domaincapsdata/qemu_10.0.0.s390x.xml               | 1 +
> > >  tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_7.0.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_7.1.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml       | 1 +
> > >  tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml       | 1 +
> > >  tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_7.2.0.ppc.xml                  | 1 +
> > >  tests/domaincapsdata/qemu_7.2.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_8.0.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_8.1.0.s390x.xml                | 1 +
> > >  tests/domaincapsdata/qemu_8.1.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml         | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml     | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0.aarch64.xml              | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0.armv7l.xml               | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0.s390x.xml                | 1 +
> > >  tests/domaincapsdata/qemu_8.2.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_9.0.0.sparc.xml                | 1 +
> > >  tests/domaincapsdata/qemu_9.0.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml     | 1 +
> > >  tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml         | 1 +
> > >  tests/domaincapsdata/qemu_9.1.0.s390x.xml                | 1 +
> > >  tests/domaincapsdata/qemu_9.1.0.x86_64.xml               | 1 +
> > >  tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml           | 1 +
> > >  tests/domaincapsdata/qemu_9.2.0.s390x.xml                | 1 +
> > >  tests/domaincapsdata/qemu_9.2.0.x86_64.xml               | 1 +
> > >  44 files changed, 48 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> > > index 490f5b28fd..43669aa27d 100644
> > > --- a/src/qemu/qemu_capabilities.c
> > > +++ b/src/qemu/qemu_capabilities.c
> > > @@ -6497,8 +6497,11 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCaps *qemuCaps,
> > >          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);
> > > -    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS))
> > > -        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_DBUS);
> > > +    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) {
> > > +        VIR_DOMAIN_CAPS_ENUM_SET(dev->type,
> > > +                                 VIR_DOMAIN_GRAPHICS_TYPE_DBUS,
> > > +                                 VIR_DOMAIN_GRAPHICS_TYPE_RDP);
> > > +    }
> > >  }
> >
> >
> > With regards,
> > Daniel
> > --
> > |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> > |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> > |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
> >