diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8173c39cdb..f2a303d8a7 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -141,8 +141,6 @@ struct _qemuDomainObjPrivate { */ virTristateBool allowReboot; - int jobs_queued; - unsigned long migMaxBandwidth; char *origname; int nbdPort; /* Port used for migration with NBD */ diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 439a9d10c2..c8fe8ad555 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -841,13 +841,13 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, if (virTimeMillisNow(&now) < 0) return -1; - priv->jobs_queued++; + priv->job.jobsQueued++; then = now + QEMU_JOB_WAIT_TIME; retry: if ((!async && job != QEMU_JOB_DESTROY) && cfg->maxQueuedJobs && - priv->jobs_queued > cfg->maxQueuedJobs) { + priv->job.jobsQueued > cfg->maxQueuedJobs) { goto error; } @@ -980,7 +980,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, } ret = -2; } else if (cfg->maxQueuedJobs && - priv->jobs_queued > cfg->maxQueuedJobs) { + priv->job.jobsQueued > cfg->maxQueuedJobs) { if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_FAILED, _("cannot acquire state change " @@ -1010,7 +1010,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, } cleanup: - priv->jobs_queued--; + priv->job.jobsQueued--; return ret; } @@ -1130,7 +1130,7 @@ qemuDomainObjEndJob(virQEMUDriver *driver, virDomainObj *obj) qemuDomainObjPrivate *priv = obj->privateData; qemuDomainJob job = priv->job.active; - priv->jobs_queued--; + priv->job.jobsQueued--; VIR_DEBUG("Stopping job: %s (async=%s vm=%p name=%s)", qemuDomainJobTypeToString(job), @@ -1151,7 +1151,7 @@ qemuDomainObjEndAgentJob(virDomainObj *obj) qemuDomainObjPrivate *priv = obj->privateData; qemuDomainAgentJob agentJob = priv->job.agentActive; - priv->jobs_queued--; + priv->job.jobsQueued--; VIR_DEBUG("Stopping agent job: %s (async=%s vm=%p name=%s)", qemuDomainAgentJobTypeToString(agentJob), @@ -1169,7 +1169,7 @@ qemuDomainObjEndAsyncJob(virQEMUDriver *driver, virDomainObj *obj) { qemuDomainObjPrivate *priv = obj->privateData; - priv->jobs_queued--; + priv->job.jobsQueued--; VIR_DEBUG("Stopping async job: %s (vm=%p name=%s)", qemuDomainAsyncJobTypeToString(priv->job.asyncJob), diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index eaa5cda3eb..f904bd49c2 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -176,6 +176,8 @@ struct _qemuDomainObjPrivateJobCallbacks { struct _qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ + int jobsQueued; + /* The following members are for QEMU_JOB_* */ qemuDomainJob active; /* Currently running job */ unsigned long long owner; /* Thread id which set current job */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 34302b404a..e1b5e68237 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3733,7 +3733,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver, ignore_value(virTimeMillisNow(&now)); /* Restore the config of the async job which is not persisted */ - priv->jobs_queued++; + priv->job.jobsQueued++; priv->job.asyncJob = QEMU_ASYNC_JOB_BACKUP; priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); priv->job.asyncStarted = now;