qemu: capabilities: Always assume QEMU_CAPS_BLOCK_COMMIT

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>
2025-02-22 03:12:22 +00:00 · 2018-06-05 13:42:44 +02:00 · 2018-06-05 13:42:44 +02:00 · 852afb2dc4
commit 852afb2dc4
parent f1a0d2277c
39 changed files with 1 additions and 45 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -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);

--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -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 */
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@ -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) {
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -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'/>