[PATCH 47/48] qemu_capabilities: Stop detecting QEMU_CAPS_DISK_WRITE_CACHE

All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 4 ---- 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, 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6520f52c40..0b267e4f30 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1416,7 +1416,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValue *props, static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, }; @@ -1449,13 +1448,11 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = { { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = { { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = { @@ -1470,7 +1467,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = { { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index d36f3ff6ab..1f42ff6cf9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -79,7 +79,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 7afd35f5ac..047abcee8c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -77,7 +77,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 92486c7a4b..0baeeccb9b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -46,7 +46,6 @@ <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> <flag name='virtio-tablet-ccw'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='vfio-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 04e8fc40dd..438927aad0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -108,7 +108,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 551eded1a5..ff989e0878 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -81,7 +81,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 32db5ac3dd..e336e71831 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -79,7 +79,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 0b50236f53..4ce2594557 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -78,7 +78,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 89cc1e4e70..bf32de2ee4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -108,7 +108,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 7ba8152589..a791a84940 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -22,7 +22,6 @@ <flag name='spice-rendernode'/> <flag name='chardev-reconnect'/> <flag name='isa-serial'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index fef56fadf1..f8c64b4cc2 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -107,7 +107,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index fe46995758..7c8b98b600 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -80,7 +80,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 239ce68f1e..88807f0c3c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -77,7 +77,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 241bc4ebc1..1555b5bcb7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -76,7 +76,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index efe85e77e2..4433caa492 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> <flag name='virtio-tablet-ccw'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='vfio-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index df4a2cb5a8..4c34fcef02 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -107,7 +107,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index d3e37172bc..6f33a827b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -81,7 +81,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index a020e56a64..f269a8935f 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> <flag name='virtio-tablet-ccw'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='vfio-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index d3255b1eeb..ae511fdb96 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index d2f871138d..72af7d3f01 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 67f2cf482a..10e67e4c5a 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -88,7 +88,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 318c962299..698eb14698 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -77,7 +77,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index c859553038..ef1c66a5d7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 1707aef39e..a59a91a576 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -88,7 +88,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index d8f87430d6..e8c3886d14 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -83,7 +83,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 4227f95880..12980ffcf6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index f05143e297..2cd47a7770 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 504ecc0a7f..e9210dfd44 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 4d7b9c1e7d..56d1ff5fa9 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> -- 2.37.4