qemu_capabilities: Stop detecting QEMU_CAPS_DISK_SHARE_RW

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-11 09:17:52 +03:00 · 2022-11-08 08:38:06 +01:00 · 2022-11-08 08:38:06 +01:00 · 589e9a769b
commit 589e9a769b
parent 6c4148f693
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 },
-    { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
    { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
    { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
 };
@ -1450,14 +1449,12 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = {
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
    { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL },
    { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL },
-    { "share-rw", QEMU_CAPS_DISK_SHARE_RW, 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 },
-    { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
    { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
 };

@ -1473,7 +1470,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = {

 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = {
    { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL },
-    { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
    { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
 };

--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -77,7 +77,6 @@
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -75,7 +75,6 @@
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
  <flag name='spapr-vty'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -42,7 +42,6 @@
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
  <flag name='sclplmconsole'/>
-  <flag name='disk-share-rw'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
  <flag name='virtio-mouse-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -106,7 +106,6 @@
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -79,7 +79,6 @@
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -77,7 +77,6 @@
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
  <flag name='spapr-vty'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -77,7 +77,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='disk-share-rw'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -106,7 +106,6 @@
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -21,7 +21,6 @@
  <flag name='query-hotpluggable-cpus'/>
  <flag name='spice-rendernode'/>
  <flag name='chardev-reconnect'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -78,7 +78,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -75,7 +75,6 @@
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
  <flag name='spapr-vty'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -75,7 +75,6 @@
  <flag name='pcie-root-port'/>
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
-  <flag name='disk-share-rw'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -40,7 +40,6 @@
  <flag name='loadparm'/>
  <flag name='chardev-reconnect'/>
  <flag name='sclplmconsole'/>
-  <flag name='disk-share-rw'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
  <flag name='virtio-mouse-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -79,7 +79,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -40,7 +40,6 @@
  <flag name='loadparm'/>
  <flag name='chardev-reconnect'/>
  <flag name='sclplmconsole'/>
-  <flag name='disk-share-rw'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
  <flag name='virtio-mouse-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -104,7 +104,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -103,7 +103,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -86,7 +86,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -75,7 +75,6 @@
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
  <flag name='spapr-vty'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -103,7 +103,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -86,7 +86,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -81,7 +81,6 @@
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
  <flag name='spapr-vty'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -103,7 +103,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@ -80,7 +80,6 @@
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
  <flag name='spapr-vty'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -103,7 +103,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@ -103,7 +103,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vmcoreinfo'/>
-  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>