qemu_capabilities: Stop detecting QEMU_CAPS_DISK_WRITE_CACHE

All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-01-21 20:15:17 +00:00 · 2022-11-08 08:41:06 +01:00 · 2022-11-08 08:41:06 +01:00 · d974ecbab5
commit d974ecbab5
parent f28807a1e0
29 changed files with 0 additions and 32 deletions
--- 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[] = {
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>