External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT

Browse Source 
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>
This commit is contained in:
Peter Krempa 2021-04-19 13:18:21 +02:00
parent f69be987bc
commit 994996ac9e
39 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View 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);

2
src/qemu/qemu_capabilities.h
View 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 */

16
src/qemu/qemu_validate.c
View 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;

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -147,7 +147,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -111,7 +111,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -105,7 +105,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -144,7 +144,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -104,7 +104,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -146,7 +146,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@ -105,7 +105,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -146,7 +146,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
View File

@ -113,7 +113,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
View File

@ -111,7 +111,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
View File

@ -118,7 +118,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
View File

@ -118,7 +118,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -145,7 +145,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
View File

@ -145,7 +145,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
View File

@ -115,7 +115,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
View File

@ -111,7 +111,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
View File

@ -146,7 +146,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
View File

@ -117,7 +117,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
View File

@ -113,7 +113,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
View File

@ -118,7 +118,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
View File

@ -146,7 +146,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
View File

@ -146,7 +146,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
View File

@ -117,7 +117,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
View File

@ -112,7 +112,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
View File

@ -117,7 +117,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
View File

@ -146,7 +146,6 @@
<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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
View File

@ -145,7 +145,6 @@
<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'/>