qemu: move virDomainObjCanSetJob() into hypervisor

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 6a7116fb2aa8a15bb9b55ab729abcda123b8f922..0afed4641807b23fa279b8f591a03f6650f132e1 100644 (file)
--- a/src/hypervisor/domain_job.c
+++ b/src/hypervisor/domain_job.c
@@ -234,3 +234,14 @@ virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob)
            newJob == VIR_JOB_NONE ||
            (jobs->mask & JOB_MASK(newJob));
 }
+
+bool
+virDomainObjCanSetJob(virDomainJobObj *job,
+                      virDomainJob newJob,
+                      virDomainAgentJob newAgentJob)
+{
+    return ((newJob == VIR_JOB_NONE ||
+             job->active == VIR_JOB_NONE) &&
+            (newAgentJob == VIR_AGENT_JOB_NONE ||
+             job->agentActive == VIR_AGENT_JOB_NONE));
+}

diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index 618fba45bd21a139889e4a1bd9993c79dc416dd9..30893dabc3d2979710a59f69e19cdb55466119ea 100644 (file)
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -224,3 +224,7 @@ G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, virDomainObjClearJob);
 bool virDomainTrackJob(virDomainJob job);
 
 bool virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob);
+
+bool virDomainObjCanSetJob(virDomainJobObj *job,
+                           virDomainJob newJob,
+                           virDomainAgentJob newAgentJob);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 4129b434ed40fd422651ff9259be30ea5f9ff5af..8b8d0c75667fee716c359edc8c13cce0e2ab0de4 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1595,6 +1595,7 @@ virDomainJobStatusToType;
 virDomainJobTypeFromString;
 virDomainJobTypeToString;
 virDomainNestedJobAllowed;
+virDomainObjCanSetJob;
 virDomainObjClearJob;
 virDomainObjInitJob;
 virDomainObjPreserveJob;

diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 46fb2d704be1f59b9ed617e5f4471d84b0a8e52a..d682f7be383808fee34fbe711e11a46eeeaeaee4 100644 (file)
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -697,17 +697,6 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj)
     priv->job.asyncOwner = 0;
 }
 
-static bool
-qemuDomainObjCanSetJob(virDomainJobObj *job,
-                       virDomainJob newJob,
-                       virDomainAgentJob newAgentJob)
-{
-    return ((newJob == VIR_JOB_NONE ||
-             job->active == VIR_JOB_NONE) &&
-            (newAgentJob == VIR_AGENT_JOB_NONE ||
-             job->agentActive == VIR_AGENT_JOB_NONE));
-}
-
 /* Give up waiting for mutex after 30 seconds */
 #define QEMU_JOB_WAIT_TIME (1000ull * 30)
 
@@ -788,7 +777,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver,
             goto error;
     }
 
-    while (!qemuDomainObjCanSetJob(&priv->job, job, agentJob)) {
+    while (!virDomainObjCanSetJob(&priv->job, job, agentJob)) {
         if (nowait)
             goto cleanup;