qemu: Deprecate QEMU_CAPS_MACHINE_KERNEL_IRQCHIP

Now that it's no longer used, remove probing for it and mark it as deprecated. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2025-03-20 07:59:00 +00:00 · 2021-09-24 17:09:56 +02:00 · 2021-09-24 17:09:56 +02:00 · f501cec73d
commit f501cec73d
parent 7cd2e25991
41 changed files with 2 additions and 42 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -420,7 +420,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "query-named-block-nodes", /* QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
              "cpu-cache", /* QEMU_CAPS_CPU_CACHE */
              "qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */
-              "kernel-irqchip", /* QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */
+              "kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */
              "kernel-irqchip.split", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT */

              /* 255 */
@ -3205,7 +3205,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
    { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
    { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */
-    { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },
    { "numa", NULL, QEMU_CAPS_NUMA }, /* not needed after qemuCaps->version < 3000000 */
    { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
    { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -400,7 +400,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
    QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
    QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */
-    QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
+    X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
    X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */

    /* 255 */
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -62,7 +62,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -131,7 +131,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -97,7 +97,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -91,7 +91,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -62,7 +62,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -128,7 +128,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -90,7 +90,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -44,7 +44,6 @@
  <flag name='vhost-scsi'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -44,7 +44,6 @@
  <flag name='vhost-scsi'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -64,7 +64,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -91,7 +91,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -99,7 +99,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -97,7 +97,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -103,7 +103,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -103,7 +103,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -64,7 +64,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -129,7 +129,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -129,7 +129,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -101,7 +101,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -97,7 +97,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -64,7 +64,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -103,7 +103,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -99,7 +99,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -103,7 +103,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -38,7 +38,6 @@
  <flag name='spice-rendernode'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='chardev-reconnect'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -103,7 +103,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -98,7 +98,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -102,7 +102,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -63,7 +63,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -104,7 +104,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='virtio-net.tx_queue_size'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -63,7 +63,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
-  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -129,7 +129,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -128,7 +128,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
-  <flag name='kernel-irqchip'/>
  <flag name='intel-iommu.intremap'/>
  <flag name='intel-iommu.caching-mode'/>
  <flag name='intel-iommu.eim'/>