]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Always assume QEMU_CAPS_BLOCK_COMMIT
authorPeter Krempa <pkrempa@redhat.com>
Tue, 5 Jun 2018 11:42:44 +0000 (13:42 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 3 Apr 2019 09:58:10 +0000 (11:58 +0200)
qemu added the 'block-commit' command in v1.3.0 (ed61fc10e8c8d2)

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
39 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_driver.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.11.0.x86_64.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
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

index 6e83922b383c1907fc52a9940f59233cc5896cc3..a0374590f63839f5ccf72cd071f7eff016a6d7b9 100644 (file)
@@ -961,7 +961,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "transaction", QEMU_CAPS_TRANSACTION },
     { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY },
     { "query-spice", QEMU_CAPS_SPICE },
-    { "block-commit", QEMU_CAPS_BLOCK_COMMIT },
     { "query-vnc", QEMU_CAPS_VNC },
     { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR },
     { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT },
@@ -2125,7 +2124,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
     /* Probe for active commit of qemu 2.1. We don't need to query directly
      * if we have QMP schema support */
     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) &&
         qemuMonitorSupportsActiveCommit(mon))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_ACTIVE_COMMIT);
 
index 0087ccb294fa1578b63309a5194cbe4f4580b61f..4a7e5ce1434588f54ef09d4fc213c1dfdf046ff6 100644 (file)
@@ -203,7 +203,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
     X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */
     X_QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */
-    QEMU_CAPS_BLOCK_COMMIT, /* block-commit */
+    X_QEMU_CAPS_BLOCK_COMMIT, /* block-commit */
     QEMU_CAPS_VNC, /* Is -vnc available? */
 
     /* 115 */
index 536d7b57607a6e7eb39258fa4a7c75da9a034115..28d5eb0e6fc02f7dcddd815532834bf5a2f5a1c1 100644 (file)
@@ -18066,12 +18066,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_COMMIT)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("online commit not supported with this QEMU binary"));
-        goto endjob;
-    }
-
     /* Convert bandwidth MiB to bytes, if necessary */
     if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) {
         if (speed > LLONG_MAX >> 20) {
index a4028d156d6146a8121f3360eca2151a6fb2f35e..178b631d824ec73428bd682bfaa4d5c9232a3295 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 8772b7d3bec9428a8a95836428144b5dc54850d2..c184bed7c3a6e239ef79bf2ed05a327797b5689a 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 68f015e66f2bd260a9aed893408e6a0031a0836a..c7b6d4c0f0fba22ef986467d1dc0fe3f01ad6600 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index a6cc1cb35049e9bea96710816e03a96bffcb0b29..78126d75cc7050bea6675b8f72cebf71df8b018a 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 84ae8ebdeb42433a5aefd1f4e3a68f0cb22e884a..8665d9f69c1b2fd316066b5a20dcd8535eed3aae 100644 (file)
@@ -31,7 +31,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index babc25b205373c3c5091742d53d27a99b176e9e6..0a64ac8ec44e1df7e045e4957a6a7b4461ec5315 100644 (file)
@@ -30,7 +30,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index a7debf552fbe9309428cc5ae6ed8a9be0ea1ea76..d2fcf91b82bbd545f91509ec05e47fa26bd67732 100644 (file)
@@ -17,7 +17,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 97d3d9f84bc63e5c4dc9a003356b55b8d76223c3..28b56afb097831e8c031b604ec324bf0d0b41911 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index b89e956aef4a6466c782c8788611923d96fbba89..bda8c87bfd535a7fd67940525204c86629199117 100644 (file)
@@ -17,7 +17,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index bf05fa7875124a0c1fa1ded2929ef8b82f2163ef..10ff7ed988e6f5568999f391651a247a51b286fe 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index f4618105a1557ef28c26cc1e0c38857c9c5e51f4..ac67b3f9bcc500f5bb7eece963a65450612cc842 100644 (file)
@@ -31,7 +31,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index e35d3d09cfa057bc1036635c4cb613b72f17b01d..cb48b64920c988aab53e7178b77e20c82e140374 100644 (file)
@@ -30,7 +30,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 9b89c3de4c2d47a1237c6250968ce4ed621ccc2e..5f0b5e30b366d1561fcd462136f3d939f17b46f5 100644 (file)
@@ -17,7 +17,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 88c47fca1c99dc61bcde8e707785812e1583e463..88bdd7e3769bf4336da0c3267a9b24339e53701a 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index fc4181fb0a086be836aa714af0f1b2f7f7db6e0a..ec8f34eb780d152c5b9d9af9fe57e47bcf6f33b2 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 094968cd22712ef0324d74f56d486bf145aa15b6..5057617602f7a950c84ea022080f40d1e934dc9c 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index ef9ca191648358a52f8383a5761b40cb68925dfd..38e087393a9235575f80b9e01d6e1121f6d70542 100644 (file)
@@ -33,7 +33,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 3370d187b508fa574f2b7640c8fc52aa8fdee85e..5c448e2f1bade56c624a24227d6115f2010f5b9c 100644 (file)
@@ -30,7 +30,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 290800fe6552d4f6a99d8273875631eb4495ffda..93c2e0faa4991f15d399a0633604f214a0c5f1d8 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index dc156b7ef5683d1a6118225b46c196ba22727324..b86c5e884c0887d399a1749f93a355001acef045 100644 (file)
@@ -17,7 +17,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 5deba03200e35a0bfc7ed36710284a4401888978..3585c14d7b6bcc899fb22fa2c196112d03ac9ea9 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index e153c3294dabefcaf12fca81cfb2cdbdbba49d09..81125714a215988d0054587c8d96d6220b02711d 100644 (file)
@@ -17,7 +17,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index f21df7f7b048a416e4b795ecbc38271eee5654a3..6d90a6fdbfce2e6dce0225b977b809d485a54a7d 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 198ae8cd40f0d8fa0156b58292bf1cda41a918f9..5e07a1bc1b60283135b1a881114d0c3c2e503e29 100644 (file)
@@ -30,7 +30,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index f8902013b599e1fa51688ef62bf84af703c759c5..9d54691148e8c357d14b1dcdbd10b524597f1645 100644 (file)
@@ -17,7 +17,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 0f0d6551f4b61ae8c9fa265ecaafb6223d685331..f8b5fd0894bb7ce7357a8456b773b2a7865c57ed 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 805e1af9baf807411a240dc1894b265553c045d3..8fa798239d5ef8165070d6182f683530c2a10b73 100644 (file)
@@ -30,7 +30,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 978bec6172af523a852676ca30731e301c7bd472..9418e24d48ec21b454207ad9109728e54e48ea47 100644 (file)
@@ -10,7 +10,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index d39cb5e556444ba327437c00399c6bab198cb52a..d05080c4f1fba7e4ae761e8745b2c153b090f6b1 100644 (file)
@@ -10,7 +10,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 9ee63263da92d2704f45def41650eb8e6d435377..587b4485fe3bf829f0227d2c0895a5624a9094be 100644 (file)
@@ -19,7 +19,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 79d31dca65f1745073cac3096c2e51a6e76124c8..a9e73ca340e1a6c4c231f2df461f7c998e5729c4 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 848e9099f96aebb5680dc9f21c546c7713cb84a8..d08105133fdf7c737355ddbcb517197b2ec087a9 100644 (file)
@@ -30,7 +30,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 930e71e117b09c079a88130130e45283930cb89c..df206583cf2e0f6668ef550817db611c8e6534d3 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 580b895e984a5cf142db0b27c98ed3a8df502b35..8ed40f733ab68b199ce11301041aa5383f7c79b5 100644 (file)
@@ -34,7 +34,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index 5b2979d284a6a54700b5e3d83fac50cd403b69cf..9eae5d4d58976bfb4d4acc3bc0d41cc50d0738c1 100644 (file)
@@ -34,7 +34,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
index b2309d6953f52448381ef1b85bf2590382aa2b90..5fcc1e03c75280f5ef2269ce4c4385a1c61a9578 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
-  <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>