LXC: use virDomainJobObj

This patch replaces struct virLXCDomainJobObj with generalized
virDomainJobObj.

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

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 4c7265e40ce3342443c057699a9ddff0f3440637..16b667de95ee3f098b9e45468011991de5ee27b4 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -49,7 +49,7 @@ virLXCDomainObjInitJob(virLXCDomainObjPrivate *priv)
 static void
 virLXCDomainObjResetJob(virLXCDomainObjPrivate *priv)
 {
-    struct virLXCDomainJobObj *job = &priv->job;
+    virDomainJobObj *job = &priv->job;
 
     job->active = VIR_JOB_NONE;
     job->owner = 0;
@@ -103,7 +103,7 @@ virLXCDomainObjBeginJob(virLXCDriver *driver G_GNUC_UNUSED,
 
  error:
     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/lxc/lxc_domain.h b/src/lxc/lxc_domain.h
index d91dcca04b20f83b863bd063c575601a67279ef0..82c36eb94021e57d90a0a8f7248a040fa170de1f 100644 (file)
--- a/src/lxc/lxc_domain.h
+++ b/src/lxc/lxc_domain.h
@@ -54,13 +54,6 @@ struct _lxcDomainDef {
 };
 
 
-struct virLXCDomainJobObj {
-    virCond cond;                       /* Use to coordinate jobs */
-    virDomainJob active;                /* Currently running job */
-    int owner;                          /* Thread which set current job */
-};
-
-
 typedef struct _virLXCDomainObjPrivate virLXCDomainObjPrivate;
 struct _virLXCDomainObjPrivate {
     virLXCDriver *driver;
@@ -74,7 +67,7 @@ struct _virLXCDomainObjPrivate {
     virCgroup *cgroup;
     char *machineName;
 
-    struct virLXCDomainJobObj job;
+    virDomainJobObj job;
 };
 
 extern virXMLNamespace virLXCDriverDomainXMLNamespace;