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>
---
src/qemu/qemu_domainjob.c | 14 ++++++++++++--
src/qemu/qemu_domainjob.h | 4 ++--
src/qemu/qemu_process.c | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index cb20b798f7..1e5724b505 100644
--- 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 f67eace36c..2bbccf6329 100644
--- 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 dba3ad8c87..db0d9935be 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8775,7 +8775,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)
--
2.35.1