qemu: capabilities: Retire QEMU_CAPS_OVERCOMMIT

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-01-21 20:15:17 +00:00 · 2022-02-09 17:21:33 +01:00 · 2022-02-09 17:21:33 +01:00 · cb1d044e38
commit cb1d044e38
parent edfd78d7f6
36 changed files with 2 additions and 37 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -529,7 +529,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 325 */
              "scsi-disk.device_id", /* QEMU_CAPS_SCSI_DISK_DEVICE_ID */
              "virtio-pci-non-transitional", /* QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL */
-              "overcommit", /* QEMU_CAPS_OVERCOMMIT */
+              "overcommit", /* X_QEMU_CAPS_OVERCOMMIT */
              "query-current-machine", /* QEMU_CAPS_QUERY_CURRENT_MACHINE */
              "machine.virt.iommu", /* QEMU_CAPS_MACHINE_VIRT_IOMMU */

@ -3298,7 +3298,6 @@ struct virQEMUCapsCommandLineProps {
 * features should be used if possible. */
 static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
-    { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
    { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX },
    { "spice", "gl", QEMU_CAPS_SPICE_GL },
    { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -504,7 +504,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 325 */
    QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */
    QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, /* virtio *-pci-{non-}transitional devices */
-    QEMU_CAPS_OVERCOMMIT, /* -overcommit */
+    X_QEMU_CAPS_OVERCOMMIT, /* -overcommit */
    QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */
    QEMU_CAPS_MACHINE_VIRT_IOMMU, /* -machine virt,iommu */

--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -123,7 +123,6 @@
  <flag name='machine.pseries.cap-nested-hv'/>
  <flag name='memory-backend-file.align'/>
  <flag name='memory-backend-file.pmem'/>
-  <flag name='overcommit'/>
  <flag name='bochs-display'/>
  <flag name='drive-nvme'/>
  <flag name='i8042'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -164,7 +164,6 @@
  <flag name='memory-backend-file.align'/>
  <flag name='memory-backend-file.pmem'/>
  <flag name='nvdimm.unarmed'/>
-  <flag name='overcommit'/>
  <flag name='x86-max-cpu'/>
  <flag name='bochs-display'/>
  <flag name='ramfb'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -127,7 +127,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='machine.virt.iommu'/>
  <flag name='bitmap-merge'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -132,7 +132,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -128,7 +128,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -128,7 +128,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -98,7 +98,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -165,7 +165,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -165,7 +165,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -130,7 +130,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='machine.virt.iommu'/>
  <flag name='bitmap-merge'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -132,7 +132,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -99,7 +99,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -167,7 +167,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -133,7 +133,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='machine.virt.iommu'/>
  <flag name='bitmap-merge'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -137,7 +137,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -129,7 +129,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -167,7 +167,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -59,7 +59,6 @@
  <flag name='memory-backend-file.align'/>
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -166,7 +166,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -133,7 +133,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='machine.virt.iommu'/>
  <flag name='bitmap-merge'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -135,7 +135,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -127,7 +127,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -97,7 +97,6 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -166,7 +166,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -133,7 +133,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='machine.virt.iommu'/>
  <flag name='bitmap-merge'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -96,7 +96,6 @@
  <flag name='memory-backend-file.align'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -166,7 +166,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -164,7 +164,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -140,7 +140,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='machine.virt.iommu'/>
  <flag name='bitmap-merge'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -132,7 +132,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -164,7 +164,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -140,7 +140,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='machine.virt.iommu'/>
  <flag name='bitmap-merge'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -140,7 +140,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -164,7 +164,6 @@
  <flag name='nvdimm.unarmed'/>
  <flag name='scsi-disk.device_id'/>
  <flag name='virtio-pci-non-transitional'/>
-  <flag name='overcommit'/>
  <flag name='query-current-machine'/>
  <flag name='bitmap-merge'/>
  <flag name='nbd-bitmap'/>