External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CH: use virDomainJobObj

Browse Source 
This patch replaces struct virCHDomainJobObj with generalized
virDomainJobObj.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2022-07-19 15:48:24 +02:00 committed by Michal Privoznik
parent c228910d26
commit dc0ae3a50f
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ch/ch_domain.c
View File

@ -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),

9
src/ch/ch_domain.h
View File

@ -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;