Deprecate QEMU_CAPS_DRIVE_READONLY

We have been assuming its support if qemu supports -device,
which all the supported versions do.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 1e8450d3b77ca766783ee342fda5e7ca999cf00c..656162cc14c66c431135722bd916bde11312718c 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1134,8 +1134,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
         if (memmem(cache, p - cache, "unsafe", sizeof("unsafe") - 1))
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE);
     }
-    if (strstr(help, "readonly="))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY);
     if (strstr(help, "aio=threads|native"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);
     if (strstr(help, "copy-on-read=on|off"))
@@ -1173,14 +1171,8 @@ virQEMUCapsComputeCmdFlags(const char *help,
         if (strstr(help, "-chardev spiceport"))
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
     }
-    if (strstr(help, "-device")) {
+    if (strstr(help, "-device"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
-        /*
-         * When -device was introduced, qemu already supported drive's
-         * readonly option but didn't advertise that.
-         */
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY);
-    }
     if (strstr(help, "-nodefconfig"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
     if (strstr(help, "-no-user-config"))
@@ -3392,7 +3384,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b6e0f8ad77150a523732663177ac09954080bf71..ed87b131b77d5361b69042da5095bf6e2ea1653b 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -105,7 +105,7 @@ typedef enum {
     QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */
     QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
     QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */
-    QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */
+    X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */
     QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */
 
     /* 45 */

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
index 96a109b53c9d4823629c071dbc3fa69df31faafe..724291b9f92428fae0b3e09cc5340368dabf5866 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
@@ -20,7 +20,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 96460355b24dd017546d1f5f8ceb75cef3d71df1..4eb66af51674bae03e7b0ecb324fa33db40966b7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index ee124735e7e3d0d030c84eeaebeb6493604e3a92..72ea76f2eee67b895003db51939194b313e5638c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 701d2ed7072d6c726e2e654dc9c82c26183c2d50..1702208c3c416d7fbded307e2ca6b4453f1c976a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index fe05deff0ad2e698c1382865459b18774ce48b05..4e01f3f0f895fd5d0eb39680480bf5f98f9ec0f8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
index a7173082c54681e4a03f61f8e8465edc8b58bb94..2063f9ff57caf023ac5884b25eb89682785a6703 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 3570a630aa792ffec5daf895a54e7132006140dd..954aa09c0578115b1b1e543096ba558c775d0d5f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 4850587555d9eb0a308b819c78c7fa00bc5d886c..1361d32eae93176f907a9e2e8603ca2413c128b1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 3e490cd456d9dc655e8291c53ce8ce55e1fd25ab..a01e90ace60314343959717f409dd6c0e2cb9455 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index ad81f240c1f7a575245372b6230753aebf5c1838..5816993460832fc2b2107874adf0b5af94522294 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -18,7 +18,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index ebffcaaa4dd162d83fcabed62c387758901f845a..83a78170113ebe7f94c15dc29b898acb96c8acc9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -18,7 +18,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index 6768061ae0ecc90c985c56673de5c2a506f1a519..caa2ce3106f1083580ea7300dee5803021bad6aa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -18,7 +18,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 1773ce490bd1f643b822c1d385c178e45e829e79..41675f1f935a9255eb405b584ac2e838bd17e68b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -21,7 +21,6 @@
   <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
-  <flag name='drive-readonly'/>
   <flag name='smbios-type'/>
   <flag name='vga-qxl'/>
   <flag name='spice'/>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index f94f2d082f8db5bce567e29bbe6cb08692caec26..31fe871c56784188767db1df15d6857e2b8925dc 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -153,7 +153,6 @@ mymain(void)
 
     DO_TEST("qemu-0.12.1", 12001, 0, 0,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
@@ -173,7 +172,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_KVM,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_PCIDEVICE,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_CHARDEV,
@@ -218,7 +216,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_KVM,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_PCIDEVICE,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
@@ -244,7 +241,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_KVM,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_PCIDEVICE,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
@@ -299,7 +295,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_KVM,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_PCIDEVICE,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_CHARDEV,
@@ -351,7 +346,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_KVM,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_PCIDEVICE,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_CHARDEV,
@@ -410,7 +404,6 @@ mymain(void)
     DO_TEST("qemu-1.0", 1000000, 0, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
@@ -485,7 +478,6 @@ mymain(void)
     DO_TEST("qemu-1.1.0", 1001000, 0, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 67218a11568857692e2350036a2272417672675b..9194d8994fc1d2788ec3738e6925e762da1e26b0 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -300,7 +300,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
     virQEMUCapsSetList(extraFlags,
                        QEMU_CAPS_NO_ACPI,
                        QEMU_CAPS_DEVICE,
-                       QEMU_CAPS_DRIVE_READONLY,
                        QEMU_CAPS_LAST);
 
     if (STREQ(vm->def->os.machine, "pc") &&
@@ -661,8 +660,7 @@ mymain(void)
     DO_TEST_FAILURE("reboot-timeout-enabled", NONE);
 
     DO_TEST("bios", QEMU_CAPS_SGA);
-    DO_TEST("bios-nvram",
-            QEMU_CAPS_DRIVE_READONLY);
+    DO_TEST("bios-nvram", NONE);
     DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG);
     DO_TEST("clock-localtime", NONE);
     DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC);
@@ -760,10 +758,9 @@ mymain(void)
     DO_TEST("floppy-drive-fat",
             QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("disk-drive-readonly-disk",
-            QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-drive-readonly-no-device",
-            QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG);
+            QEMU_CAPS_NODEFCONFIG);
     DO_TEST("disk-drive-fmt-qcow",
             QEMU_CAPS_DRIVE_BOOT);
     DO_TEST("disk-drive-shared",
@@ -1647,7 +1644,7 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);
     DO_TEST("hostdev-scsi-readonly",
-            QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC);
     DO_TEST("hostdev-scsi-virtio-scsi",
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,