]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT
authorPeter Krempa <pkrempa@redhat.com>
Mon, 19 Apr 2021 11:18:21 +0000 (13:18 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 3 May 2021 10:14:45 +0000 (12:14 +0200)
The feature is present in all supported qemu versions (>2.11) and there
isn't a reasonable way to detect it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
39 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_validate.c
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml

index 97523367351f0044e4a5c7756b3e753b95d0a2a3..e1168190f6f2caf3536a1eaa5424b645df00b671 100644 (file)
@@ -5021,7 +5021,6 @@ void
 virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
 {
     /* Following caps were asserted by a version check for pre 2.11 qemus */
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
 
index 8dfb572002f9679c065686b80097a970a53424a6..75d8ff32391eda8f2dd29da72b8cbab9b85769b5 100644 (file)
@@ -401,7 +401,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     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 */
-    QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */
+    X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */
 
     /* 255 */
     QEMU_CAPS_INTEL_IOMMU_INTREMAP, /* intel-iommu.intremap */
index f07492dd24e83f261e1ca7308c227d69e3e76de9..3ea1e0f5e8c5e9bc7c92f824c04935fc989dbdc0 100644 (file)
@@ -201,22 +201,6 @@ qemuValidateDomainDefFeatures(const virDomainDef *def,
                                      "this QEMU binary"));
                     return -1;
                 }
-
-                switch ((virDomainIOAPIC) def->features[i]) {
-                case VIR_DOMAIN_IOAPIC_QEMU:
-                    if (!virQEMUCapsGet(qemuCaps,
-                                        QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT)) {
-                        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                       _("split I/O APIC is not supported by this "
-                                         "QEMU binary"));
-                        return -1;
-                    }
-                    break;
-                case VIR_DOMAIN_IOAPIC_KVM:
-                case VIR_DOMAIN_IOAPIC_NONE:
-                case VIR_DOMAIN_IOAPIC_LAST:
-                    break;
-                }
             }
             break;
 
index 15d7351b5abc9ebdb7f409c0ae6915f677084d1d..c0f66b52d0f21b58bdd80a2cd00445fba4eaa7c1 100644 (file)
@@ -74,7 +74,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 600440a8faba8116893e23bbc6ecdb1a1219f30e..dcba32e9f09e00ad5730acee9e43d66142162f69 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index 7e4c80dcd30f3e35e79968b8b8b4f40e187d0ca5..36dd3d7f334195c4a095ef36326160dda813b498 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index c6a08f24dbf32675119339f4f4f64291acd24908..a210dd32bad3c63016aad65df358c6af0819ad23 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index e513140803e812d3372cbc916502d5abfd5c29b2..8559a8fbdecfbfa74a4f27768332d2b757354dad 100644 (file)
@@ -74,7 +74,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 162e9986086f667f3857579a36808a40178f8f93..c1a994b7e34b60d815e8f44af7393ed896e389a6 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index e4ef9962b7210fd0c65471dab67d8adfdb856887..8cd7b7ef6dd45cf50e114fe4ad1cc5f091241c0f 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 9f979c8daae54c6e3f3cdc6c7d80df43220eaca5..578cac9392cf58bf0e74376a176c1891acb5b833 100644 (file)
@@ -58,7 +58,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='loadparm'/>
   <flag name='vnc-multi-servers'/>
index 90ee6c226cb91308254a5f10da02e812dce7fc4f..c369d8e45dacf7728f7e64c4c30dcad4cbe9454e 100644 (file)
@@ -58,7 +58,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='loadparm'/>
   <flag name='vnc-multi-servers'/>
index f61705b5865b1a43f3cbfca902f7fb744f06b5a7..9cfb8433a731f2e929b5870592107bb301252e24 100644 (file)
@@ -76,7 +76,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index fab1f314b84b35aaeece752ffb792f74796674b1..d9f35cb7f50bdeb0b34ff8681c53e8697be1e063 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index c392c6b2d96904bbd724fc8996470c4af55203f5..b8bcd19c16369253efc023f5646949dfcc4aaf33 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index f8f3cfe6ac7423a9caa2f384504f3d74b8018f70..72ea2abe13105c49e8d13d2a6df91ae8f0a592ed 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index 8dfb5a4eed3cdcbd222cf36fc748fabd576a1dc5..23fea52993365312471833a92f88e03fe102e568 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 6c07bcebeb37bef62706085cc3f6937c7299a9f0..8f8e055b994ee5257893406a41aef81f26495842 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 65b3335f011adc4601f762429302fee97f818b24..454d390a5ee8620b4a83095775c359aed0832707 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 1bfbd182ba1b0b1d245a0fdb3fba0bf47b40dce9..faab6a574947d081a16c306687b71ca20054c8b2 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 4db4e2cfe4abbe10cec35f0659a83351e8a577e3..7c97b357f30c954be059608594ad95a74cdbe0a8 100644 (file)
@@ -76,7 +76,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 7cc0fc1f1defaf43971dc1722817da26e18a6702..605b4290026ef1022e72c89377b66a3f9d1996d7 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index 14eedc132885c2c44c7eb3a4da492f3ed392105e..7ef4eedc6ac97c333a9d1a86964f4e31ae2be445 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index c47d86dbab07e1aa6fcdbb453949d53b2e597529..6df6f94d5ad7bf3037cec56037c36843f8771f5d 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 656e03ae5e1fdc91043889b008906477ce685fb4..5da94bc3ff2233827fa8fb5b44e5f4e13c86adc2 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 7cea3cd3800cbd9b1e5d781b26d0a64d6a931522..4f750c76ce6618f0e2d2d321ea21e81eb844303b 100644 (file)
@@ -76,7 +76,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index b755a28f331c1b2cdaa9db4c65827435c6b9da4f..d778d73b0eefa284e30e1b4a82214b38cf8b9073 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index aafc60699831b829b067acb96e6027b3869fa0ad..2557c55f9b5aeb2a3d9aa10162919e0ac62d557a 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 285f5bf442ea10490c0c12bb7e5ded969bfaf233..af563deae8afa1215a06e759299a02d0bd646ee9 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index a68480918078cf4abfc1e3865b2937b36b71c6cc..0599d6461079e0a1ced4be71c022368545b6cadf 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index b15de30e5bc69e537fd77f355a2e86c30794ed51..b4dce8e8c768e87444b63e57e9fa7dd4a818c123 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index a5e320acc0711006246d24d4cf0ebaa108a5b09a..e0b2f0a6a9629d4010449172625f17ab01c929a7 100644 (file)
@@ -53,7 +53,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='loadparm'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
index d3ab98a10863b80c91d19afd663b148537272084..5b95090748dc21d687e744d4efbf6275b80d8e83 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index 6944ff6474ed4625f4dfb2f6d4e001ed6067f5e3..1b643b772daa199c5f5ee4cc16769e13c0a7d3bd 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index c1f26914631bd0f1bf065f99bba5bed49f29a8cf..aad42b9fac0f09c829c81228f2280986ec90bf62 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index cc7e04a5f115e79dbf418a1b0c4120bb87b616f7..1c9e0f6ec6f040124389fa5822ad309bea837d0e 100644 (file)
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index 5148591b10737bf332d500824ddb1a4debbd932b..eebb6d03d3ecc62460e06cd99b1e3322ac556631 100644 (file)
@@ -75,7 +75,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
index db0136b0f0f0c353a1bddd7809043d7295e1f81a..1161649a8b1763dd9e5b61f93105791b102786eb 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
index da24669162228b819ac73525ae12213ad08dae7c..62f5d397aae94f82d67f034a7de6a2cdfb590221 100644 (file)
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='kernel-irqchip'/>
-  <flag name='kernel-irqchip.split'/>
   <flag name='intel-iommu.intremap'/>
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>