openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_NUMA_DIST 

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 f20f266e66
commit 4a0d9a123c
41 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_capabilities.c
View File

@ -5020,9 +5020,6 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps,
void
virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
{
/* Following caps were asserted by a version check for pre 2.11 qemus */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
switch (qemuCaps->arch) {
case VIR_ARCH_I686:
case VIR_ARCH_X86_64:

2
src/qemu/qemu_capabilities.h
View File

@ -429,7 +429,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_VMCOREINFO, /* -device vmcoreinfo */
QEMU_CAPS_DEVICE_SPAPR_VTY, /* -device spapr-vty */
QEMU_CAPS_DEVICE_SCLPLMCONSOLE, /* -device sclplmconsole */
QEMU_CAPS_NUMA_DIST, /* -numa dist */
X_QEMU_CAPS_NUMA_DIST, /* -numa dist */
/* 275 */
QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */

8
src/qemu/qemu_validate.c
View File

@ -840,14 +840,6 @@ qemuValidateDomainDefNuma(const virDomainDef *def,
}
}
if (virDomainNumaNodesDistancesAreBeingSet(def->numa) &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_DIST)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting NUMA distances is not "
"supported with this qemu"));
return -1;
}
if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
def->virtType,
def->os.machine)) {

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

@ -84,7 +84,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -161,7 +161,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -121,7 +121,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -118,7 +118,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -84,7 +84,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -158,7 +158,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -117,7 +117,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -64,7 +64,6 @@
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -64,7 +64,6 @@
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -86,7 +86,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -160,7 +160,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -118,7 +118,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -160,7 +160,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -123,7 +123,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='pl011'/>

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

@ -124,7 +124,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -127,7 +127,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -127,7 +127,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -86,7 +86,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -159,7 +159,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -159,7 +159,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -125,7 +125,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='pl011'/>

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

@ -124,7 +124,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -86,7 +86,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -160,7 +160,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -127,7 +127,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='pl011'/>

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

@ -126,7 +126,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -127,7 +127,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -160,7 +160,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -56,7 +56,6 @@
<flag name='loadparm'/>
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -159,7 +159,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -126,7 +126,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='pl011'/>

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

@ -124,7 +124,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -125,7 +125,6 @@
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -84,7 +84,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>

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

@ -159,7 +159,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

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

@ -158,7 +158,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='numa.dist'/>
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>

2
tests/qemuxml2argvtest.c
View File

@ -2153,7 +2153,7 @@ mymain(void)
QEMU_CAPS_OBJECT_MEMORY_RAM);
DO_TEST_PARSE_ERROR("numatune-memnode-no-memory", NONE);
DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST);
DO_TEST("numatune-distances", QEMU_CAPS_NUMA);
DO_TEST("numatune-no-vcpu", NONE);
DO_TEST_CAPS_LATEST("numatune-hmat");

2
tests/qemuxml2xmltest.c
View File

@ -1101,7 +1101,7 @@ mymain(void)
DO_TEST("numatune-auto-prefer", NONE);
DO_TEST("numatune-memnode", QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST);
DO_TEST("numatune-distances", QEMU_CAPS_NUMA);
DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA);
DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT, QEMU_CAPS_OBJECT_MEMORY_RAM);
DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode");