qemu: blockjob: Rename public APIs

All the public APIs of the qemu_blockjob module operate on a 'disk'.
Since I'll be adding APIs which operate on a job later let's rename the
existing ones.

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

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index dd033c0b5dba023adf8200da4bec4c73812ff640..1b7c107ab89f4e8b6a7a7c5808007a805949cabc 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -198,7 +198,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
 
 
 /**
- * qemuBlockJobUpdate:
+ * qemuBlockJobUpdateDisk:
  * @vm: domain
  * @disk: domain disk
  * @error: error (output parameter)
@@ -209,10 +209,10 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
  * Returns the block job event processed or -1 if there was no pending event.
  */
 int
-qemuBlockJobUpdate(virDomainObjPtr vm,
-                   qemuDomainAsyncJob asyncJob,
-                   virDomainDiskDefPtr disk,
-                   char **error)
+qemuBlockJobUpdateDisk(virDomainObjPtr vm,
+                       qemuDomainAsyncJob asyncJob,
+                       virDomainDiskDefPtr disk,
+                       char **error)
 {
     qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -237,20 +237,20 @@ qemuBlockJobUpdate(virDomainObjPtr vm,
 
 
 /**
- * qemuBlockJobSyncBegin:
+ * qemuBlockJobSyncBeginDisk:
  * @disk: domain disk
  *
  * Begin a new synchronous block job for @disk. The synchronous
- * block job is ended by a call to qemuBlockJobSyncEnd, or by
+ * block job is ended by a call to qemuBlockJobSyncEndDisk, or by
  * the guest quitting.
  *
  * During a synchronous block job, a block job event for @disk
  * will not be processed asynchronously. Instead, it will be
- * processed only when qemuBlockJobUpdate or qemuBlockJobSyncEnd
+ * processed only when qemuBlockJobUpdateDisk or qemuBlockJobSyncEndDisk
  * is called.
  */
 void
-qemuBlockJobSyncBegin(virDomainDiskDefPtr disk)
+qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk)
 {
     qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
 
@@ -261,7 +261,7 @@ qemuBlockJobSyncBegin(virDomainDiskDefPtr disk)
 
 
 /**
- * qemuBlockJobSyncEnd:
+ * qemuBlockJobSyncEndDisk:
  * @vm: domain
  * @disk: domain disk
  *
@@ -269,11 +269,11 @@ qemuBlockJobSyncBegin(virDomainDiskDefPtr disk)
  * for the disk is processed.
  */
 void
-qemuBlockJobSyncEnd(virDomainObjPtr vm,
-                    qemuDomainAsyncJob asyncJob,
-                    virDomainDiskDefPtr disk)
+qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
+                        qemuDomainAsyncJob asyncJob,
+                        virDomainDiskDefPtr disk)
 {
     VIR_DEBUG("disk=%s", disk->dst);
-    qemuBlockJobUpdate(vm, asyncJob, disk, NULL);
+    qemuBlockJobUpdateDisk(vm, asyncJob, disk, NULL);
     QEMU_DOMAIN_DISK_PRIVATE(disk)->blockJobSync = false;
 }

diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index fa4f18f8ee476cf3a99d1c8139c9aa84cbd91483..5d2459635e26497463ba8e69ebe39f114b1ce61e 100644 (file)
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -26,14 +26,14 @@
 # include "qemu_conf.h"
 # include "qemu_domain.h"
 
-int qemuBlockJobUpdate(virDomainObjPtr vm,
-                       qemuDomainAsyncJob asyncJob,
-                       virDomainDiskDefPtr disk,
-                       char **error);
+int qemuBlockJobUpdateDisk(virDomainObjPtr vm,
+                           qemuDomainAsyncJob asyncJob,
+                           virDomainDiskDefPtr disk,
+                           char **error);
 
-void qemuBlockJobSyncBegin(virDomainDiskDefPtr disk);
-void qemuBlockJobSyncEnd(virDomainObjPtr vm,
-                         qemuDomainAsyncJob asyncJob,
-                         virDomainDiskDefPtr disk);
+void qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk);
+void qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
+                             qemuDomainAsyncJob asyncJob,
+                             virDomainDiskDefPtr disk);
 
 #endif /* LIBVIRT_QEMU_BLOCKJOB_H */

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3010d875370e250b137c3bec2f279e9e396f641a..b9a92642dfa7e8fb8c425ff5897e65d4837db7e8 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4737,7 +4737,7 @@ processBlockJobEvent(virQEMUDriverPtr driver,
     diskPriv->blockJobType = type;
     diskPriv->blockJobStatus = status;
 
-    qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL);
+    qemuBlockJobUpdateDisk(vm, QEMU_ASYNC_JOB_NONE, disk, NULL);
 
  endjob:
     qemuDomainObjEndJob(driver, vm);
@@ -17409,7 +17409,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
     }
 
     if (!async)
-        qemuBlockJobSyncBegin(disk);
+        qemuBlockJobSyncBeginDisk(disk);
 
     if (pivot) {
         if ((ret = qemuDomainBlockPivot(driver, vm, device, disk)) < 0)
@@ -17448,19 +17448,19 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
      * scheduled block jobs from confusing us. */
     if (!async) {
         qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
-        qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL);
+        qemuBlockJobUpdateDisk(vm, QEMU_ASYNC_JOB_NONE, disk, NULL);
         while (diskPriv->blockjob) {
             if (virDomainObjWait(vm) < 0) {
                 ret = -1;
                 goto endjob;
             }
-            qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL);
+            qemuBlockJobUpdateDisk(vm, QEMU_ASYNC_JOB_NONE, disk, NULL);
         }
     }
 
  endjob:
     if (disk)
-        qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk);
+        qemuBlockJobSyncEndDisk(vm, QEMU_ASYNC_JOB_NONE, disk);
     qemuDomainObjEndJob(driver, vm);
 
  cleanup:

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a0b622d2ea384da65675b0cd066edc8cfd5d1ca5..8720b343119b21fbc713a7f2111973f5fd9e483f 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -490,7 +490,7 @@ qemuMigrationSrcNBDStorageCopyReady(virDomainObjPtr vm,
         if (!diskPriv->migrating)
             continue;
 
-        status = qemuBlockJobUpdate(vm, asyncJob, disk, &error);
+        status = qemuBlockJobUpdateDisk(vm, asyncJob, disk, &error);
         if (status == VIR_DOMAIN_BLOCK_JOB_FAILED) {
             if (error) {
                 virReportError(VIR_ERR_OPERATION_FAILED,
@@ -549,7 +549,7 @@ qemuMigrationSrcNBDCopyCancelled(virDomainObjPtr vm,
         if (!diskPriv->migrating)
             continue;
 
-        status = qemuBlockJobUpdate(vm, asyncJob, disk, &error);
+        status = qemuBlockJobUpdateDisk(vm, asyncJob, disk, &error);
         switch (status) {
         case VIR_DOMAIN_BLOCK_JOB_FAILED:
             if (check) {
@@ -566,7 +566,7 @@ qemuMigrationSrcNBDCopyCancelled(virDomainObjPtr vm,
             ATTRIBUTE_FALLTHROUGH;
         case VIR_DOMAIN_BLOCK_JOB_CANCELED:
         case VIR_DOMAIN_BLOCK_JOB_COMPLETED:
-            qemuBlockJobSyncEnd(vm, asyncJob, disk);
+            qemuBlockJobSyncEndDisk(vm, asyncJob, disk);
             diskPriv->migrating = false;
             break;
 
@@ -630,7 +630,7 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr driver,
     int status;
     int rv;
 
-    status = qemuBlockJobUpdate(vm, asyncJob, disk, &error);
+    status = qemuBlockJobUpdateDisk(vm, asyncJob, disk, &error);
     switch (status) {
     case VIR_DOMAIN_BLOCK_JOB_FAILED:
     case VIR_DOMAIN_BLOCK_JOB_CANCELED:
@@ -712,7 +712,7 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver,
                     err = virSaveLastError();
                 failed = true;
             }
-            qemuBlockJobSyncEnd(vm, asyncJob, disk);
+            qemuBlockJobSyncEndDisk(vm, asyncJob, disk);
             diskPriv->migrating = false;
         }
     }
@@ -954,7 +954,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver,
         if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk)))
             goto cleanup;
 
-        qemuBlockJobSyncBegin(disk);
+        qemuBlockJobSyncBeginDisk(disk);
 
         if (flags & VIR_MIGRATE_TLS) {
             rc = qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm,
@@ -971,7 +971,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver,
         }
 
         if (rc < 0) {
-            qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk);
+            qemuBlockJobSyncEndDisk(vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk);
             goto cleanup;
         }
 
@@ -5355,7 +5355,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver,
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDefPtr disk = vm->def->disks[i];
         if (QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating) {
-            qemuBlockJobSyncBegin(disk);
+            qemuBlockJobSyncBeginDisk(disk);
             storage = true;
         }
     }
@@ -5385,7 +5385,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver,
             VIR_DEBUG("Drive mirror on disk %s is still running", disk->dst);
         } else {
             VIR_DEBUG("Drive mirror on disk %s is gone", disk->dst);
-            qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk);
+            qemuBlockJobSyncEndDisk(vm, QEMU_ASYNC_JOB_NONE, disk);
             diskPriv->migrating = false;
         }
     }
@@ -5407,7 +5407,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver,
             qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
 
             if (diskPriv->migrating) {
-                qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk);
+                qemuBlockJobSyncEndDisk(vm, QEMU_ASYNC_JOB_NONE, disk);
                 diskPriv->migrating = false;
             }
         }