[PATCH 05/48] qemu_capabilities: Stop detecting QEMU_CAPS_NUMA

Michal Privoznik mprivozn at redhat.com
Tue Nov 8 08:29:07 UTC 2022


All supported QEMUs have this capability. Stop detecting it.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 1 -
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml  | 1 -
 29 files changed, 29 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 39c2d38969..db918952ac 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1219,7 +1219,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD },
     { "query-display-options", QEMU_CAPS_QUERY_DISPLAY_OPTIONS },
     { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN },
-    { "set-numa-node", QEMU_CAPS_NUMA },
     { "set-action", QEMU_CAPS_SET_ACTION },
     { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE },
     { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET },
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index a89a77fbde..5db14f0afc 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -44,7 +44,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 47529e9c6e..3d12939f0c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 7456516422..72381c8065 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -23,7 +23,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='enable-fips'/>
-  <flag name='numa'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 53b1dda4da..3e4453dfa7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -57,7 +57,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 9002c29711..64a7ae39c6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -46,7 +46,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 3b0828efd3..6bbf25fc6c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -44,7 +44,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 2db333b322..7d8b64bdae 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -47,7 +47,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 5fbc028142..93b19c9754 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -57,7 +57,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 2ba3ca88a5..01a13aecfc 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -15,7 +15,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='enable-fips'/>
-  <flag name='numa'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 6b2faaf51b..0c04999a94 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -57,7 +57,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index b0b9fff8b8..55e0bf1580 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -45,7 +45,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index d537801191..47fc5d0c13 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index c775410ced..ea05bb23dc 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -46,7 +46,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index a89bf23f48..1f75f00a2e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -22,7 +22,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='numa'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index b22a8f4efe..22bdb2152a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index cef489646a..acc30efaee 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -44,7 +44,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 3c20758fe0..81f64ce654 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -22,7 +22,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='numa'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
   <flag name='aes-key-wrap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 2a1ede597a..031f7c1e4e 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index c36e457708..781dd9bb6b 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index da509b777d..7a4883814f 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 88e6957240..7bdd685940 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 16fe1026b5..69ca8b058b 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index f6b0c084e4..ff18e057f3 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 0f5b887bcd..04e0a675b1 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -49,7 +49,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 9eef4f0820..7eb171f433 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
index 6e3b7e00f3..0c06ed1e16 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='iothread'/>
   <flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 7b92a0b8c8..c8a66bd84a 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index 01dbf72185..c5f3236c18 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='numa'/>
   <flag name='usb-audio'/>
   <flag name='rtc-reset-reinjection'/>
   <flag name='iothread'/>
-- 
2.37.4



More information about the libvir-list mailing list