]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: deprecate QEMU_CAPS_FSDEV_READONLY
authorJán Tomko <jtomko@redhat.com>
Thu, 29 Mar 2018 10:51:55 +0000 (12:51 +0200)
committerJán Tomko <jtomko@redhat.com>
Tue, 17 Apr 2018 10:33:00 +0000 (12:33 +0200)
Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
28 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_command.c
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

index fa01ab5280d81b74f8303469a9bb4fe16c7aa150..6b6ff7a54be42530aa7dba219d953966100991c8 100644 (file)
@@ -3626,7 +3626,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
index a95993196b3168572a8ef708f4ba2f3a5e32b8a7..97633b1131c10621d03a7e5ff8c26a9118c56f6b 100644 (file)
@@ -157,7 +157,7 @@ typedef enum {
     X_QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */
     QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
     QEMU_CAPS_NO_ACPI, /* -no-acpi */
-    QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */
+    X_QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */
 
     /* 80 */
     QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */
index 527a35779decbb8de51e6b5227c94510c974befb..8ff1d362ab51fefc971dadbf1701dfc54717afb3 100644 (file)
@@ -2371,16 +2371,8 @@ qemuBuildFSStr(virDomainFSDefPtr fs,
     virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias);
     virBufferAsprintf(&opt, ",path=%s", fs->src->path);
 
-    if (fs->readonly) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV_READONLY)) {
-            virBufferAddLit(&opt, ",readonly");
-        } else {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("readonly filesystem is not supported by this "
-                             "QEMU binary"));
-            goto error;
-        }
-    }
+    if (fs->readonly)
+        virBufferAddLit(&opt, ",readonly");
 
     if (virBufferCheckError(&opt) < 0)
         goto error;
index 58208d3f3b025112955f878fdb9cd66fd3c713f3..f9d7babc98383bbdbf472b93c57334fe96f2667b 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index d6183e40096b5c1d75eac298dab8cbfbc2a969e6..da4cf265d436367879160e8362b0cdd2f736c794 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 4af8078a56aab51ee6e405bcfa5c5219b60638a8..cbf81f0f05dedbcf47652019020735b2a6eb79f5 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 6bd1dcfb99bbd2572ef929f6a15a6183533b2b92..306fc30895edece1581253042c292a601e829b7b 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index ab1d635e64c864533c366e2cdbc25a63427e362e..d80038c4e0a04cf9d65bddcff417503d082fb3f9 100644 (file)
@@ -19,7 +19,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index d26d716452833a8c5d78f3922cf0cf04e2eb30ea..c8d5818761b960bd4218b37da43d3a36ddeb479c 100644 (file)
@@ -18,7 +18,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index cfee4d138927c6ce959d76c93ce8b8b0fc6fff0c..f71dfd8647cef147a94fa4bf427657e72a319537 100644 (file)
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index bfd3b3c6370a5a1574d6ccd7b7b472630a8fb580..767fa0a42eace61e980d8e55fac4a0062e429217 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 398a5a84cb11fcf320519111e5ee3e376a6296f6..fd1952c3ccfecc67537496f4ecbb1cea36e679c4 100644 (file)
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index c769b4b369b00ed4d44569cea16cc0af94007544..4f3d32abf2336a71945e302b567a40cf0ad38204 100644 (file)
@@ -19,7 +19,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 0bdaef177ce78d2e1490f3163e17a76e2810b883..6d15fd41026f670eacb9a423ecc850948995357d 100644 (file)
@@ -18,7 +18,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 2fe64a7bfd3d74c369527089f638450f17f69b67..259277ae75ec2fdda6508223160ae518495f4bab 100644 (file)
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index f71b37cee26d0ef6dd38b6962a4c5aeeee90eb56..e44ae682526c6d023847d44e89b101ae626657b2 100644 (file)
@@ -26,7 +26,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 8e7c2a5daff37de3b3955a5ebfa443490830e78d..294a110e960d563cb79a3d1d276d133966cb05bf 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 223d0a7a3c0d28f13f6ac5a5758b6c0329954a99..fd95ccf56066e26ed45a1189d26708aaf8a2629a 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 46c006b80598f67c2cbb9a65475af7a056bef7e1..dc9741e76fa785f3b0084b57a6e5e1ab4bf4adab 100644 (file)
@@ -21,7 +21,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 6c7799924db4f542570dfb174319ce038179316b..71d3ab282bb9cf84755f468b7dd724603b803505 100644 (file)
@@ -18,7 +18,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 720e84b47efc742102c889530c396b26b5d241ee..cd1bb4d7091c6d579426c43b1828c848362c70f2 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 8e2e796b280c48aa306016d8869821142ba56097..b0be73ce54e4bec06d089a1c5dea195dee5e65cf 100644 (file)
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index c900360c071d0720cbd352fda61ee9f10f0e634b..6c135ab27555eda6b7bbeb25f6f728f667804fbf 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 44957621b5fcdb7c394671f34c1e6d82e1d3d60d..85b57d9c3adc5011c549d33268f1a8f1a6c5cb74 100644 (file)
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index a32a10cfb24d15dc0399b73f9c4dfd6aa68f4cd1..f362433d0ffd0770038b4e3299291e8c1c57cafb 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index db61974e6b630987b31952b0ca7da43139d8effc..d78567689f29dde04e7d39da714a7ed47c55eaac 100644 (file)
@@ -18,7 +18,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index da8b39dc206adf659413ab4dc7c2d036a17d6145..e585940edce59728fe6b40fc81f8895756e6a0ad 100644 (file)
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>
index 5697923c3edf398c068a6fe0cb8c0e9e025a3969..9e97990752bde144c47110d5456ff033cac01e52 100644 (file)
@@ -28,7 +28,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>
   <flag name='fsdev-writeout'/>