qemu: capabilities: Introduce QEMU_CAPS_OBJECT_MONITOR_QMP

Detect whether qemu supports monitor instantiated via '-object' instead
of the legacy '-mon'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index be57dcad8e352f356dca88e1b7f339f42af67671..ebea050453e685b056cc738f9c87e2f417232c12 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -767,6 +767,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 495 */
               "blockdev-mirror.target-is-zero", /* QEMU_CAPS_BLOCKDEV_MIRROR_TARGET_IS_ZERO */
+              "object-monitor-qmp", /* QEMU_CAPS_OBJECT_MONITOR_QMP */
     );
 
 
@@ -1480,6 +1481,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "iommufd", QEMU_CAPS_OBJECT_IOMMUFD },
     { "uefi-vars-x64", QEMU_CAPS_DEVICE_UEFI_VARS },
     { "uefi-vars-sysbus", QEMU_CAPS_DEVICE_UEFI_VARS },
+    { "monitor-qmp", QEMU_CAPS_OBJECT_MONITOR_QMP },
 };
 
 

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 3014f3dc5e91d0377f3336bf6670b58dac3d5241..daec874a591bae6b894e57efdc53046fc4fa9820 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -741,6 +741,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 495 */
     QEMU_CAPS_BLOCKDEV_MIRROR_TARGET_IS_ZERO, /* 'blockdev-mirror' supports 'target-is-zero' */
+    QEMU_CAPS_OBJECT_MONITOR_QMP, /* 'monitor-qmp' -object */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml
index 1f1d4f1fa9b5343f8c4ca8002e21ddfe631d9919..b45dd83889440a76c379cfb867e87557811d4538 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml
@@ -188,6 +188,7 @@
   <flag name='uefi-vars'/>
   <flag name='query-block-flat'/>
   <flag name='blockdev-mirror.target-is-zero'/>
+  <flag name='object-monitor-qmp'/>
   <version>11000090</version>
   <microcodeVersion>61700287</microcodeVersion>
   <package>v11.1.0-rc0</package>

diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
index 56f06ad2e88fdac9fbc3412e595b7aad4e5d8d2c..7a4396c82baffdd35be72d72511ca0df3cfe4186 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
@@ -222,6 +222,7 @@
   <flag name='query-block-flat'/>
   <flag name='amd-iommu.xtsup'/>
   <flag name='blockdev-mirror.target-is-zero'/>
+  <flag name='object-monitor-qmp'/>
   <version>11000090</version>
   <microcodeVersion>43100287</microcodeVersion>
   <package>v11.1.0-rc0</package>