qemuDomainDiskBlockJobIsSupported: Assume QEMU_CAPS_BLOCKDEV is supported

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

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 3e94138728da1b9b3bdd63248fb1a0aab8312a26..7ce6ca13cff17304e9a5ebd11e608216ee52b66e 100644 (file)
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -260,7 +260,7 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm,
         return -1;
     }
 
-    if (!qemuDomainDiskBlockJobIsSupported(vm, dd->domdisk))
+    if (!qemuDomainDiskBlockJobIsSupported(dd->domdisk))
         return -1;
 
     if (dd->store->format == VIR_STORAGE_FILE_NONE) {

diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index 71650bde0e382ac5f7e816a5e04b5edbb4aacc0e..ed236eaaced753dc151134f72198c58509704c5e 100644 (file)
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -372,7 +372,7 @@ qemuCheckpointPrepare(virQEMUDriver *driver,
             return -1;
         }
 
-        if (!qemuDomainDiskBlockJobIsSupported(vm, vm->def->disks[i]))
+        if (!qemuDomainDiskBlockJobIsSupported(vm->def->disks[i]))
             return -1;
     }
 

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 1784c05c9ed103ecf6867f3d6ce856dba79d3481..0a60a59c8f0302cc6a6a8c5082df6666eaed67b9 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11252,19 +11252,15 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm,
 /**
  * qemuDomainDiskBlockJobIsSupported:
  *
- * Returns true if block jobs are supported on @disk by @vm or false and reports
+ * Returns true if block jobs are supported on @disk or false and reports
  * an error otherwise.
  *
  * Note that this does not verify whether other block jobs are running etc.
  */
 bool
-qemuDomainDiskBlockJobIsSupported(virDomainObj *vm,
-                                  virDomainDiskDef *disk)
+qemuDomainDiskBlockJobIsSupported(virDomainDiskDef *disk)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        qemuDiskBusIsSD(disk->bus)) {
+    if (qemuDiskBusIsSD(disk->bus)) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
                        _("block jobs are not supported on disk '%s' using bus 'sd'"),
                        disk->dst);

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index b117db7b75f4e68b036df55b6acce5c0f2aa0206..3ff77b7e021b3b942bf40085fad3b9c15763f6c0 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -1047,8 +1047,7 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm,
                                         virQEMUDriverConfig *cfg);
 
 bool
-qemuDomainDiskBlockJobIsSupported(virDomainObj *vm,
-                                  virDomainDiskDef *disk);
+qemuDomainDiskBlockJobIsSupported(virDomainDiskDef *disk);
 
 int
 qemuDomainDefNumaCPUsRectify(virDomainDef *def,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7d7e4b8ae924f9ee60487fb9d162ed4c366002e2..bb723723d03c9f3f8d59102a8e4c1dce9bfa1cd8 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14428,7 +14428,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
     if (qemuDomainDiskBlockJobIsActive(disk))
         goto endjob;
 
-    if (!qemuDomainDiskBlockJobIsSupported(vm, disk))
+    if (!qemuDomainDiskBlockJobIsSupported(disk))
         goto endjob;
 
     if (base &&
@@ -14958,7 +14958,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
     if (qemuDomainDiskBlockJobIsActive(disk))
         goto endjob;
 
-    if (!qemuDomainDiskBlockJobIsSupported(vm, disk))
+    if (!qemuDomainDiskBlockJobIsSupported(disk))
         goto endjob;
 
     if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN &&
@@ -15427,7 +15427,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
     if (!(disk = qemuDomainDiskByName(vm->def, path)))
         goto endjob;
 
-    if (!qemuDomainDiskBlockJobIsSupported(vm, disk))
+    if (!qemuDomainDiskBlockJobIsSupported(disk))
         goto endjob;
 
     if (virStorageSourceIsEmpty(disk->src)) {

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index d13f7fa0d2e85bd73aec8261bd0eba02c33a2d59..6033deafed0a0a52b63cebad40d4d5de10905f07 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -446,8 +446,7 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDef *snapdisk,
 
 
 static int
-qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,
-                                      virDomainSnapshotDiskDef *snapdisk,
+qemuSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDef *snapdisk,
                                       virDomainDiskDef *domdisk)
 {
     virStorageType actualType = virStorageSourceGetActualType(snapdisk->src);
@@ -462,7 +461,7 @@ qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,
         return -1;
     }
 
-    if (!qemuDomainDiskBlockJobIsSupported(vm, domdisk))
+    if (!qemuDomainDiskBlockJobIsSupported(domdisk))
         return -1;
 
     switch (actualType) {
@@ -491,8 +490,7 @@ qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,
 
 
 static int
-qemuSnapshotPrepareDiskExternal(virDomainObj *vm,
-                                virDomainDiskDef *disk,
+qemuSnapshotPrepareDiskExternal(virDomainDiskDef *disk,
                                 virDomainSnapshotDiskDef *snapdisk,
                                 bool active,
                                 bool reuse)
@@ -507,7 +505,7 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm,
         if (qemuSnapshotPrepareDiskExternalInactive(snapdisk, disk) < 0)
             return -1;
     } else {
-        if (qemuSnapshotPrepareDiskExternalActive(vm, snapdisk, disk) < 0)
+        if (qemuSnapshotPrepareDiskExternalActive(snapdisk, disk) < 0)
             return -1;
     }
 
@@ -700,8 +698,7 @@ qemuSnapshotPrepare(virDomainObj *vm,
                 }
             }
 
-            if (qemuSnapshotPrepareDiskExternal(vm, dom_disk, disk,
-                                                active, reuse) < 0)
+            if (qemuSnapshotPrepareDiskExternal(dom_disk, disk, active, reuse) < 0)
                 return -1;
 
             external++;