qemu: Rename qemuDomainObjRestoreJob as qemuDomainObjPreserveJob

It is used for saving job out of domain object. Just like
virErrorPreserveLast is used for errors. Let's make the naming
consistent as Restore would suggest different semantics.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index cb20b798f78498d2f4e6fc6970ee795de51cd243..1e5724b505d7f3bd12c4cba3b22a279dec12661b 100644 (file)
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -214,9 +214,19 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObj *job)
         job->cb->resetJobPrivate(job->privateData);
 }
 
+
+/**
+ * qemuDomainObjPreserveJob
+ * @param obj domain with a job that needs to be preserved
+ * @param job structure where to store job details from @obj
+ *
+ * Saves the current job details from @obj to @job and resets the job in @obj.
+ *
+ * Returns 0 on success, -1 on failure.
+ */
 int
-qemuDomainObjRestoreJob(virDomainObj *obj,
-                        qemuDomainJobObj *job)
+qemuDomainObjPreserveJob(virDomainObj *obj,
+                         qemuDomainJobObj *job)
 {
     qemuDomainObjPrivate *priv = obj->privateData;
 

diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index f67eace36c1b038c658d1d4d5c2cf2956f832104..2bbccf63297eb3910318eb57a4b3a9a96c39d842 100644 (file)
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -158,8 +158,8 @@ void qemuDomainObjSetJobPhase(virDomainObj *obj,
                               int phase);
 void qemuDomainObjSetAsyncJobMask(virDomainObj *obj,
                                   unsigned long long allowedJobs);
-int qemuDomainObjRestoreJob(virDomainObj *obj,
-                            qemuDomainJobObj *job);
+int qemuDomainObjPreserveJob(virDomainObj *obj,
+                             qemuDomainJobObj *job);
 void qemuDomainObjDiscardAsyncJob(virDomainObj *obj);
 void qemuDomainObjReleaseAsyncJob(virDomainObj *obj);
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 2f0167299fb800cde0f32fc00e393116a426d023..18445855db397cfb4d182c0846a0739f848b02b7 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8714,7 +8714,7 @@ qemuProcessReconnect(void *opaque)
     cfg = virQEMUDriverGetConfig(driver);
     priv = obj->privateData;
 
-    qemuDomainObjRestoreJob(obj, &oldjob);
+    qemuDomainObjPreserveJob(obj, &oldjob);
     if (oldjob.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN)
         stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
     if (oldjob.asyncJob == VIR_ASYNC_JOB_BACKUP && priv->backup)