qemu: domain: Remove qemuDomainSupportsCheckpointsBlockjobs

The function now serves no real purpose.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 76e7f4ca833c0c79aa67d7469571b7b82b98bc0a..2468725bf746078f60d04cdddd64e40b7e653edf 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -3592,9 +3592,6 @@ qemuBlockCommit(virDomainObj *vm,
     if (qemuDomainDiskBlockJobIsActive(disk))
         return NULL;
 
-    if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
-        return NULL;
-
     if (topSource == disk->src) {
         /* XXX Should we auto-pivot when COMMIT_ACTIVE is not specified? */
         if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_ACTIVE)) {

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index ea29765c61d50a974f8e543fc9dc4de2bb16f73a..29fac0034ef5236714ee17de3b08c0fbcc84f349 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -10169,20 +10169,6 @@ qemuDomainDefHasManagedPR(virDomainObj *vm)
 }
 
 
-/**
- * qemuDomainSupportsCheckpointsBlockjobs:
- * @vm: domain object
- *
- * Checks whether a block job is supported in possible combination with
- * checkpoints (qcow2 bitmaps). Returns -1 if unsupported and reports an error
- * 0 in case everything is supported.
- */
-int
-qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm G_GNUC_UNUSED)
-{
-    return 0;
-}
-
 /**
  * qemuDomainInitializePflashStorageSource:
  *

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 04577f1297f12881223cb34bf11dd94c01e0cbd2..8e53a270a78964407b551dabfb34ec97508eab53 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -1053,10 +1053,6 @@ int
 qemuDomainValidateActualNetDef(const virDomainNetDef *net,
                                virQEMUCaps *qemuCaps);
 
-int
-qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm)
-    G_GNUC_WARN_UNUSED_RESULT;
-
 int
 qemuDomainMakeCPUMigratable(virArch arch,
                             virCPUDef *cpu,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f974d2fba8160180b0948a4351f2b0fa20a5acad..af5445f78df6fa9abcbb278af5d8b8a57bc21728 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13624,9 +13624,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;
 
-    if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
-        goto endjob;
-
     if (!(disk = qemuDomainDiskByName(vm->def, path)))
         goto endjob;
 
@@ -14150,9 +14147,6 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;
 
-    if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
-        goto endjob;
-
     if (!(disk = qemuDomainDiskByName(vm->def, path)))
         goto endjob;
 

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 9556bd121664bc9ac3f81f43a710c7b28e70387d..9c2ab47c51cbea85419c059918603c29bed31097 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1082,7 +1082,6 @@ qemuSnapshotPrepare(virDomainObj *vm,
     }
 
     /* Handle interlocking with 'checkpoints':
-     * - if the VM is online use qemuDomainSupportsCheckpointsBlockjobs
      * - if the VM is offline disallow external snapshots as the support for
      *   propagating bitmaps into the would-be-created overlay is not yet implemented
      */
@@ -1093,9 +1092,6 @@ qemuSnapshotPrepare(virDomainObj *vm,
                            _("support for offline external snapshots while checkpoint exists was not yet implemented"));
             return -1;
         }
-    } else {
-        if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
-            return -1;
     }
 
     /* Alter flags to let later users know what we learned.  */