[PATCH 3/5] LXC: use virDomainJobObj
This patch replaces struct virLXCDomainJobObj with generalized
virDomainJobObj.
Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com>
---
src/lxc/lxc_domain.c | 4 ++--
src/lxc/lxc_domain.h | 9 +--------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 4c7265e40c..16b667de95 100644
--- 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 d91dcca04b..82c36eb940 100644
--- 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;
--
2.35.3