qemu: blockjob: Convert qemuBlockJobSyncEndDisk to take job instead of disk

And rename it in accordance with the change.

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 d72e51b73c12bd15c40a3ba66d505872030aa379..c75396bec70617388547d618d2141d4b74f9a768 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -388,12 +388,12 @@ qemuBlockJobUpdate(virDomainObjPtr vm,
  * @disk: domain disk
  *
  * Begin a new synchronous block job for @disk. The synchronous
- * block job is ended by a call to qemuBlockJobSyncEndDisk, or by
+ * block job is ended by a call to qemuBlockJobSyncEnd, 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 qemuBlockJobSyncEndDisk
+ * processed only when qemuBlockJobUpdate or qemuBlockJobSyncEnd
  * is called.
  */
 void
@@ -411,7 +411,7 @@ qemuBlockJobSyncBegin(qemuBlockJobDataPtr job)
 
 
 /**
- * qemuBlockJobSyncEndDisk:
+ * qemuBlockJobSyncEnd:
  * @vm: domain
  * @disk: domain disk
  *
@@ -421,16 +421,16 @@ qemuBlockJobSyncBegin(qemuBlockJobDataPtr job)
  * qemuBlockJobStartupFinalize will be called.
  */
 void
-qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
-                        int asyncJob,
-                        virDomainDiskDefPtr disk)
+qemuBlockJobSyncEnd(virDomainObjPtr vm,
+                    qemuBlockJobDataPtr job,
+                    int asyncJob)
 {
-    qemuBlockJobDataPtr job = QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob;
+    const char *diskdst = NULL;
 
-    if (!job)
-        return;
+    if (job->disk)
+        diskdst = job->disk->dst;
 
-    VIR_DEBUG("disk=%s", disk->dst);
+    VIR_DEBUG("disk=%s", NULLSTR(diskdst));
     qemuBlockJobUpdate(vm, job, asyncJob);
     job->synchronous = false;
 }

diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index 2f6d1afcf33faa392c5202ce2a62c5200852ed24..f20346ebffdc1b2f80ce04f045580662ef3cd8c5 100644 (file)
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -100,9 +100,9 @@ int qemuBlockJobUpdate(virDomainObjPtr vm,
                        int asyncJob);
 
 void qemuBlockJobSyncBegin(qemuBlockJobDataPtr job);
-void qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
-                             int asyncJob,
-                             virDomainDiskDefPtr disk);
+void qemuBlockJobSyncEnd(virDomainObjPtr vm,
+                         qemuBlockJobDataPtr job,
+                         int asyncJob);
 
 qemuBlockJobDataPtr
 qemuBlockJobGetByDisk(virDomainDiskDefPtr disk)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3d3ab6256f8f936109743aafe37b9591babed57f..ee64f0ce0a0a00bdfaf2d52e230f9fdbc2d95db3 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17456,8 +17456,8 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
     }
 
  endjob:
-    if (disk)
-        qemuBlockJobSyncEndDisk(vm, QEMU_ASYNC_JOB_NONE, disk);
+    if (job && !async)
+        qemuBlockJobSyncEnd(vm, job, QEMU_ASYNC_JOB_NONE);
     qemuDomainObjEndJob(driver, vm);
 
  cleanup:

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 066d9490e921ec78ae589e03c3b5719580d81276..ac4e6ca5103133a3b47d9de5ed2eae71f827e18b 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -723,7 +723,7 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver,
                     err = virSaveLastError();
                 failed = true;
             }
-            qemuBlockJobSyncEndDisk(vm, asyncJob, disk);
+            qemuBlockJobSyncEnd(vm, job, asyncJob);
             diskPriv->migrating = false;
         }