qemu: introduce QEMU_CAPS_DEVICE_PANIC_PCI

This capability detects the availability of the pvpanic-pci device that is required in order to use pvpanic on Arm (original pvpanic is an emulated ISA device, for which Arm does not have support). Signed-off-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2024-07-11 04:15:49 +00:00 · 2023-02-20 17:12:54 +01:00 · 2023-02-20 17:12:54 +01:00 · 741624a1a6
commit 741624a1a6
parent 6db7b2d2ca
16 changed files with 17 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -686,6 +686,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "netdev.stream", /* QEMU_CAPS_NETDEV_STREAM */
              "virtio-crypto", /* QEMU_CAPS_DEVICE_VIRTIO_CRYPTO */
              "cryptodev-backend-lkcf", /* QEMU_CAPS_OBJECT_CRYPTO_LKCF */
+              "pvpanic-pci", /* QEMU_CAPS_DEVICE_PANIC_PCI */
    );


@ -1398,6 +1399,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "virtio-crypto-pci", QEMU_CAPS_DEVICE_VIRTIO_CRYPTO },
    { "virtio-crypto-device", QEMU_CAPS_DEVICE_VIRTIO_CRYPTO },
    { "cryptodev-backend-lkcf", QEMU_CAPS_OBJECT_CRYPTO_LKCF },
+    { "pvpanic-pci", QEMU_CAPS_DEVICE_PANIC_PCI },
 };


--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -665,6 +665,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_NETDEV_STREAM, /* -netdev stream */
    QEMU_CAPS_DEVICE_VIRTIO_CRYPTO, /* virtio-crypto device */
    QEMU_CAPS_OBJECT_CRYPTO_LKCF, /* -object cryptodev-backend-lkcf */
+    QEMU_CAPS_DEVICE_PANIC_PCI, /* -device pvpanic-pci */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -144,6 +144,7 @@
  <flag name='usb-host.guest-resets-all'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -184,6 +184,7 @@
  <flag name='usb-host.guest-resets-all'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -189,6 +189,7 @@
  <flag name='usb-host.guest-resets-all'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>6001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -156,6 +156,7 @@
  <flag name='usb-host.guest-resets-all'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>6001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -150,6 +150,7 @@
  <flag name='virtio-net.rss'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>6002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -191,6 +191,7 @@
  <flag name='usb-host.guest-resets-all'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>6002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -164,6 +164,7 @@
  <flag name='usb-host.guest-resets-all'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>6002092</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -168,6 +168,7 @@
  <flag name='usb-host.guest-resets-all'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>7000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -197,6 +197,7 @@
  <flag name='migration.blocked-reasons'/>
  <flag name='sgx-epc'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>7000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@ -168,6 +168,7 @@
  <flag name='query-stats-schemas'/>
  <flag name='screenshot-format-png'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>7001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -200,6 +200,7 @@
  <flag name='query-stats-schemas'/>
  <flag name='screenshot-format-png'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>7001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@ -204,6 +204,7 @@
  <flag name='netdev.stream'/>
  <flag name='virtio-crypto'/>
  <flag name='cryptodev-backend-lkcf'/>
+  <flag name='pvpanic-pci'/>
  <version>7002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100245</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_8.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0.riscv64.xml
@ -143,6 +143,7 @@
  <flag name='screenshot-format-png'/>
  <flag name='netdev.stream'/>
  <flag name='virtio-crypto'/>
+  <flag name='pvpanic-pci'/>
  <version>7002050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
@ -204,6 +204,7 @@
  <flag name='netdev.stream'/>
  <flag name='virtio-crypto'/>
  <flag name='cryptodev-backend-lkcf'/>
+  <flag name='pvpanic-pci'/>
  <version>7002050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100244</microcodeVersion>