qemu: introduce QEMU_CAPS_MACHINE_VIRT_RAS capability

The capability can be used to detect if the qemu binary already
supports 'ras' feature for 'virt' machine type.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 21f93c677487e280f612c52f8115380e045a685e..9da7faf27dcb37d226a73d6065de4877bc2eff92 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -706,6 +706,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "blockjob.backing-mask-protocol", /* QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL */
               "display-reload", /* QEMU_CAPS_DISPLAY_RELOAD */
               "usb-mtp", /* QEMU_CAPS_DEVICE_USB_MTP */
+              "machine.virt.ras", /* QEMU_CAPS_MACHINE_VIRT_RAS */
     );
 
 
@@ -1733,6 +1734,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsPSeries[] = {
 
 static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] = {
     { "iommu", QEMU_CAPS_MACHINE_VIRT_IOMMU },
+    { "ras", QEMU_CAPS_MACHINE_VIRT_RAS },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGeneric[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5082967cba73d1a387497436d53c08fd421d7b9e..618584a1eda115f5d356c70a7c1798f765f56461 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -685,6 +685,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL, /* backing-mask-protocol of block-commit/block-stream */
     QEMU_CAPS_DISPLAY_RELOAD, /* 'display-reload' qmp command is supported */
     QEMU_CAPS_DEVICE_USB_MTP, /* -device usb-mtp */
+    QEMU_CAPS_MACHINE_VIRT_RAS, /* -machine virt,ras= */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index ddd30feaffe0fac181d67ca6bb27f5c78a93f485..905726f7c1fd2da0b3a86b32d3d5c2131154c51c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -125,6 +125,7 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <flag name='usb-mtp'/>
+  <flag name='machine.virt.ras'/>
   <version>5002000</version>
   <microcodeVersion>61700243</microcodeVersion>
   <package>v5.2.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index 7cf7c0707baab9e4dcd925fccffd69e594745cbd..97bbcdeb687e44806cc0e15e63028a2d9129a2c0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -136,6 +136,7 @@
   <flag name='pvpanic-pci'/>
   <flag name='display-reload'/>
   <flag name='usb-mtp'/>
+  <flag name='machine.virt.ras'/>
   <version>6000000</version>
   <microcodeVersion>61700242</microcodeVersion>
   <package>v6.0.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 13253f13c0a1eb1d3a71dc8eec11e7fb61812614..a7a6f54019324c992d750b1ecddf36516e619db1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -149,6 +149,7 @@
   <flag name='virtio-gpu.blob'/>
   <flag name='display-reload'/>
   <flag name='usb-mtp'/>
+  <flag name='machine.virt.ras'/>
   <version>6001050</version>
   <microcodeVersion>61700244</microcodeVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index b359f22b030569cfc448a857a6aee9ff74d862d6..ab21278e50bdd1bd961713d31b43a5eaf3e23980 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -157,6 +157,7 @@
   <flag name='virtio-gpu.blob'/>
   <flag name='display-reload'/>
   <flag name='usb-mtp'/>
+  <flag name='machine.virt.ras'/>
   <version>6002092</version>
   <microcodeVersion>61700243</microcodeVersion>
   <package>v7.0.0-rc2</package>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index c6f31b94fd831f9b635142f4fc05192d6e360847..f53c3ddcd88f088025112811797233136e3db7bf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -157,6 +157,7 @@
   <flag name='virtio-gpu.blob'/>
   <flag name='display-reload'/>
   <flag name='usb-mtp'/>
+  <flag name='machine.virt.ras'/>
   <version>6002092</version>
   <microcodeVersion>61700243</microcodeVersion>
   <package>v7.0.0-rc2</package>

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index fe4c65c9b765a163c3acb1f161ceab11348feba4..c9d99f56cbc91e2cb67e8544f57961236028cca8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@@ -165,6 +165,7 @@
   <flag name='virtio-mem-pci.dynamic-memslots'/>
   <flag name='display-reload'/>
   <flag name='usb-mtp'/>
+  <flag name='machine.virt.ras'/>
   <version>8002000</version>
   <microcodeVersion>61700246</microcodeVersion>
   <package>v8.2.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index e26dc43963f9e55f5843938471282993774d50e8..b5a1d426dcc12ba705167f7eef3077e2d5aa015d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@@ -172,6 +172,7 @@
   <flag name='virtio-mem-pci.dynamic-memslots'/>
   <flag name='display-reload'/>
   <flag name='usb-mtp'/>
+  <flag name='machine.virt.ras'/>
   <version>8002000</version>
   <microcodeVersion>0</microcodeVersion>
   <package>qemu-8.2.0-7.fc39</package>