qemu & hypervisor: move qemuDomainObjClearJob() into hypervisor

This patch moves qemuDomainObjClearJob() as
virDomainObjClearJob() into hypervisor in order to be used by
other hypervisors as well.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c
index 804a58047f148509d88056848b14463b122b5dd2..2a19811670289acc5f66b43ef1dcadbead2d36ac 100644 (file)
--- a/src/hypervisor/domain_job.c
+++ b/src/hypervisor/domain_job.c
@@ -206,3 +206,17 @@ virDomainObjPreserveJob(virDomainJobObj *currJob,
     virDomainObjResetAsyncJob(currJob);
     return 0;
 }
+
+void
+virDomainObjClearJob(virDomainJobObj *job)
+{
+    virDomainObjResetJob(job);
+    virDomainObjResetAsyncJob(job);
+    g_clear_pointer(&job->current, virDomainJobDataFree);
+    g_clear_pointer(&job->completed, virDomainJobDataFree);
+    virCondDestroy(&job->cond);
+    virCondDestroy(&job->asyncCond);
+
+    if (job->cb)
+        g_clear_pointer(&job->privateData, job->cb->freeJobPrivate);
+}

diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index 44e4bfdb4a18ae93e96ede9481191fdf2bf95586..53ce6706d4a9ef2c311a37e34d643a4c8befc09b 100644 (file)
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -217,3 +217,6 @@ void virDomainObjResetAsyncJob(virDomainJobObj *job);
 
 int virDomainObjPreserveJob(virDomainJobObj *currJob,
                             virDomainJobObj *job);
+
+void virDomainObjClearJob(virDomainJobObj *job);
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, virDomainObjClearJob);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index abb4f859562f2223504e176e5223939b2fa8e2e8..ed927b9e4bd07e1f52cb5c9988bfb33254727408 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1594,6 +1594,7 @@ virDomainJobDataInit;
 virDomainJobStatusToType;
 virDomainJobTypeFromString;
 virDomainJobTypeToString;
+virDomainObjClearJob;
 virDomainObjInitJob;
 virDomainObjPreserveJob;
 virDomainObjResetAgentJob;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index bc44687958f890e2c5fffe0854549f07dcd7831c..36e4228318b77a3ffd520e52373ecb99d219985a 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1719,7 +1719,7 @@ qemuDomainObjPrivateFree(void *data)
     qemuDomainObjPrivateDataClear(priv);
 
     virObjectUnref(priv->monConfig);
-    qemuDomainObjClearJob(&priv->job);
+    virDomainObjClearJob(&priv->job);
     g_free(priv->lockState);
     g_free(priv->origname);
 

diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 4b8ba3f0bcb41bcb99ff25253deb93c33ce7feff..f323f28c7722e51ed6408871c36e17bd4f3d23fe 100644 (file)
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -185,20 +185,6 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
 }
 
 
-void
-qemuDomainObjClearJob(virDomainJobObj *job)
-{
-    virDomainObjResetJob(job);
-    virDomainObjResetAsyncJob(job);
-    g_clear_pointer(&job->current, virDomainJobDataFree);
-    g_clear_pointer(&job->completed, virDomainJobDataFree);
-    virCondDestroy(&job->cond);
-    virCondDestroy(&job->asyncCond);
-
-    if (job->cb)
-        g_clear_pointer(&job->privateData, job->cb->freeJobPrivate);
-}
-
 bool
 qemuDomainTrackJob(virDomainJob job)
 {

diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index 6272f9d84568d80954c16411601f6fc2289ccf4b..eed94cd87cdbb22a4ed4e3428a93c65370291b27 100644 (file)
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -133,9 +133,6 @@ int qemuDomainJobDataToParams(virDomainJobData *jobData,
 
 bool qemuDomainTrackJob(virDomainJob job);
 
-void qemuDomainObjClearJob(virDomainJobObj *job);
-G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, qemuDomainObjClearJob);
-
 int
 qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
                                  virDomainObj *vm);