[libvirt PATCH v2 02/15] qemu: add -display dbus capability check (to update to 6.3)

marcandre.lureau at redhat.com marcandre.lureau at redhat.com
Thu Dec 2 14:23:58 UTC 2021


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

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
 src/qemu/qemu_capabilities.c                         |  2 ++
 src/qemu/qemu_capabilities.h                         |  1 +
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies | 10 +++++++++-
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml     |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6fee5bc1a418..495f7171da1c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -653,6 +653,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "query-dirty-rate", /* QEMU_CAPS_QUERY_DIRTY_RATE */
               "rbd-encryption", /* QEMU_CAPS_RBD_ENCRYPTION */
               "chardev-vdagent", /* QEMU_CAPS_CHARDEV_VDAGENT */
+              "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
     );
 
 
@@ -1573,6 +1574,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE },
     { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT },
     { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_VDAGENT },
+    { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS },
 };
 
 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 15547e59c83d..4c6a7c020b73 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -632,6 +632,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_QUERY_DIRTY_RATE, /* accepts query-dirty-rate */
     QEMU_CAPS_RBD_ENCRYPTION, /* Ceph RBD encryption support */
     QEMU_CAPS_CHARDEV_VDAGENT, /* -chardev qemu-vdagent */
+    QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
index 69d3b1b12a6e..e823ad1188b8 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
@@ -5000,6 +5000,10 @@
         {
           "case": "spice-app",
           "type": "0"
+        },
+        {
+          "case": "dbus",
+          "type": "0"
         }
       ],
       "members": [
@@ -11456,6 +11460,9 @@
         },
         {
           "name": "spice-app"
+        },
+        {
+          "name": "dbus"
         }
       ],
       "meta-type": "enum",
@@ -11465,7 +11472,8 @@
         "sdl",
         "egl-headless",
         "curses",
-        "spice-app"
+        "spice-app",
+        "dbus"
       ]
     },
     {
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 145137ddfa08..8001ddde8887 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -241,6 +241,7 @@
   <flag name='query-dirty-rate'/>
   <flag name='rbd-encryption'/>
   <flag name='chardev-vdagent'/>
+  <flag name='display-dbus'/>
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-- 
2.34.1.8.g35151cf07204




More information about the libvir-list mailing list