]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_OVERCOMMIT
authorPeter Krempa <pkrempa@redhat.com>
Wed, 9 Feb 2022 16:21:33 +0000 (17:21 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 4 Apr 2022 10:26:59 +0000 (12:26 +0200)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
36 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
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.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml

index f35cc03a9b3e298a444946a43881c6325eb660ae..7003ac54bc4fb9c5e54fea4b13f2647d154d7af3 100644 (file)
@@ -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 },
index 36c3656d37088f09aacea462f82cd456679e6a69..cae11723e07d461532872b6a17581b27f907179d 100644 (file)
@@ -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 */
 
index 3b2cffbafeb9dc22d9f61052b61a85fe0a909634..b53e3f0273fc671dcdd3345733ec5db6002c32a9 100644 (file)
   <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'/>
index c679d6da451a457287a2a7fbf6edb7b0a91f05f0..33b04a9241723cd72373fff1438563591d5858ff 100644 (file)
   <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'/>
index 379b065b3770de5bc75f81e25693373334143712..e8420d174c90afcf9b7fa70b9d87fcac324831be 100644 (file)
   <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'/>
index 65266a18a3f86706d6cb51972c0e718dedb3a0de..921879c1363a92f93dd22822d237441295994d22 100644 (file)
   <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'/>
index 1a7ed270a6ef2c7cd9140d642f5adcb71d0218c0..d100866f599e67ba9d1e65880bdb8197c3f76284 100644 (file)
   <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'/>
index 2100b5846d6c42b5a3dc3165a6df2466b9336f11..41521510fb78bfdfa036fb7f95809e4e6b6bef31 100644 (file)
   <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'/>
index 7694a2ff39f3f2c960ef903f37bb0d6cb7c0494a..c6d61cbe12f70f85e7b6ecf2b84a5cd54817f144 100644 (file)
@@ -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'/>
index 0efe860c99122c323c4ce48b479a6ad9c89bf69b..5e2ceb1c88ba8343bd424af8ae9b1f11e4c73c59 100644 (file)
   <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'/>
index 4ec7183c450773725b64a9b6f9fc1d951e2c539c..02b213db15c17dadad7173f9dc4a149c0c6af558 100644 (file)
   <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'/>
index af0ef7c2d73b4c0b7ac3c808665dbc71334a1ac4..d72ca120d261ce921ed6fabd386a7177b9f269d6 100644 (file)
   <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'/>
index 2218c60c8bee705fd0fbc8a40eaac6d86b1ce4db..65c43ad6673e572e636a1ae63df432dc25f02802 100644 (file)
   <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'/>
index 5303ea614a9ab92a56474e149fdba7c7f8dadf3c..ffcf158a953467a0a971f154ecd0889b68417878 100644 (file)
@@ -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'/>
index 345d66545f2de910b566ad7e5e1715ea702a1f6a..f02ac8788fe162f634edbdca768a8df7b3840e1e 100644 (file)
   <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'/>
index 69fcc15f048d6e0c68b8be0562a5e71a9ca48c0b..7866126dce44b6b0555fe45ae05c3cb579251766 100644 (file)
   <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'/>
index ec241007d691857a4d56230de3baff2faef3bce7..b64ff470d8e4c1d9e95b8d3f9418d6ecd0335bf3 100644 (file)
   <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'/>
index da1f81defba02cf0591641400caef3a9751a64c6..5d6525dbdc6fbd7b9883a446a97a8629ca4b5cb4 100644 (file)
   <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'/>
index d660d14f8d1f0b78a7593f2e9260998f9da2569a..3c7f48c6c461e71ee3a8800ee6d69b435a20740c 100644 (file)
   <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'/>
index 4d295a87232dffa8c7e201deca09a4ab4e044f78..42c0ef6a22a4e34c35e5402c4084ac6743260b75 100644 (file)
@@ -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'/>
index 1650e2c51c8676588674e8529601ab23d8060623..56f288a92296554c6b267e5932ba109a91f86212 100644 (file)
   <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'/>
index cca41d2fd8ceeb3b4a27fcfac6673d7b5cacc372..809d8919610076cb22fc098ab82e01ac1429e8b6 100644 (file)
   <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'/>
index ea7d0452407d07836f4cb1b16427886b638c7ee4..4c8e77a5afd8333eedbab03a3b43486ce69c53ee 100644 (file)
   <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'/>
index 1357a547513bb37ecf92f53578d44db89ff7fbf8..22c4e6f83e6407894a0b1af70e34cf40ff0459a9 100644 (file)
   <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'/>
index ca01b6ac03f2b9d4d4547002095f1d2adb4ac2bc..342679b9e57a4af648dd1aec220d0133db728882 100644 (file)
@@ -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'/>
index 2601c011146a6b7e4a5e298fbfefad0797d33eb0..46793cfd46aa7716dddc2872543bc47301243ccd 100644 (file)
   <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'/>
index ff9d4498f43a19170bf227f3bc16612c984f8050..5b233c2119660a2139d81a8245f0e98f4654cfa7 100644 (file)
   <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'/>
index 1f80794c7463806083f977245677caf92594ebe6..db509b57cfcc8bc66e9991a8f3f34a550a7be601 100644 (file)
@@ -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'/>
index d78c19447280210c2a18388a17a4b9e4baa25fd4..8fbbb3264609718cc0d9ea30676eae266fbcfd52 100644 (file)
   <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'/>
index 352010eb993957e1b38d48ddacbe7c7d5c8f31dd..c58c114c00a5965990ebddfe1c5520f925db1a45 100644 (file)
   <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'/>
index c50105ad3790bfcfbd055a3899c832cf6cfa6298..79348369647c5d83bd88a3a0ff70a959931d237f 100644 (file)
   <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'/>
index ad222c8678ebd2839a32eb10cf5dc56a3237ee9f..613040c3e036e8769f58786804d108e5377b08ed 100644 (file)
   <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'/>
index 1b0bac279e94609eb9fa360b866fb630f8fe656f..af49bee1586f739cdecff6ccb914f50aae140a62 100644 (file)
   <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'/>
index cc1cad0ec37b55711df33d8aaf92d67f744dbe99..521a6e3053edc68c35c7d9da8530a80221573a2d 100644 (file)
   <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'/>
index b3dd120f591d5c33927165fd6f5345ebc46c6d0c..7da800ba073ac2cb318f392d75b0ecb4d4b51359 100644 (file)
   <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'/>
index f621595771381cdd931bdbe46b1c5992a91839d6..a533722d9cc624429224dd140483c3173689a396 100644 (file)
   <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'/>