CH: use virDomainJobObj

This patch replaces struct virCHDomainJobObj with generalized
virDomainJobObj.

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

diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c
index 62a6f7a9d6ab59e99b1ef74e191dcb4e604d286d..2afb3582b1c4924e18a4d5daa560c4fa6253ef83 100644 (file)
--- a/src/ch/ch_domain.c
+++ b/src/ch/ch_domain.c
@@ -46,7 +46,7 @@ virCHDomainObjInitJob(virCHDomainObjPrivate *priv)
 static void
 virCHDomainObjResetJob(virCHDomainObjPrivate *priv)
 {
-    struct virCHDomainJobObj *job = &priv->job;
+    virDomainJobObj *job = &priv->job;
 
     job->active = VIR_JOB_NONE;
     job->owner = 0;
@@ -83,7 +83,7 @@ virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job)
                   virDomainJobTypeToString(job));
         if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) {
             VIR_WARN("Cannot start job (%s) for domain %s;"
-                     " current job is (%s) owned by (%d)",
+                     " current job is (%s) owned by (%llu)",
                      virDomainJobTypeToString(job),
                      obj->def->name,
                      virDomainJobTypeToString(priv->job.active),

diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h
index f75a08ec877d4d78f176cbb8ffb80b051920e77b..b3bebd6b9a9e4b7948cb8950934fb1f0456793fa 100644 (file)
--- a/src/ch/ch_domain.h
+++ b/src/ch/ch_domain.h
@@ -30,16 +30,9 @@
 #define CH_JOB_WAIT_TIME (1000ull * 30)
 
 
-struct virCHDomainJobObj {
-    virCond cond;                       /* Use to coordinate jobs */
-    virDomainJob active;                /* Currently running job */
-    int owner;                          /* Thread which set current job */
-};
-
-
 typedef struct _virCHDomainObjPrivate virCHDomainObjPrivate;
 struct _virCHDomainObjPrivate {
-    struct virCHDomainJobObj job;
+    virDomainJobObj job;
 
     virChrdevs *chrdevs;
     virCHDriver *driver;