This patch moves qemuDomainObjBeginJobInternal() as virDomainObjBeginJobInternal() into hypervisor in order to be used by other hypervisors in the following patches. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- po/POTFILES | 1 + src/hypervisor/domain_job.c | 251 +++++++++++++++++++++++++++++++ src/hypervisor/domain_job.h | 8 + src/libvirt_private.syms | 1 + src/qemu/qemu_domainjob.c | 284 +++--------------------------------- 5 files changed, 285 insertions(+), 260 deletions(-) diff --git a/po/POTFILES b/po/POTFILES index 856c8e69b3..b9577e840d 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -90,6 +90,7 @@ src/hyperv/hyperv_util.c src/hyperv/hyperv_wmi.c src/hypervisor/domain_cgroup.c src/hypervisor/domain_driver.c +src/hypervisor/domain_job.c src/hypervisor/virclosecallbacks.c src/hypervisor/virhostdev.c src/interface/interface_backend_netcf.c diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 77110d2a23..07ee5b4a3d 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -10,6 +10,13 @@ #include "domain_job.h" #include "viralloc.h" +#include "virthreadjob.h" +#include "virlog.h" +#include "virtime.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +VIR_LOG_INIT("hypervisor.domain_job"); VIR_ENUM_IMPL(virDomainJob, @@ -247,3 +254,247 @@ virDomainObjCanSetJob(virDomainJobObj *job, (newAgentJob == VIR_AGENT_JOB_NONE || job->agentActive == VIR_AGENT_JOB_NONE)); } + +/* Give up waiting for mutex after 30 seconds */ +#define VIR_JOB_WAIT_TIME (1000ull * 30) + +/** + * virDomainObjBeginJobInternal: + * @obj: virDomainObj = domain object + * @jobObj: virDomainJobObj = domain job object + * @job: virDomainJob to start + * @agentJob: virDomainAgentJob to start + * @asyncJob: virDomainAsyncJob to start + * @nowait: don't wait trying to acquire @job + * + * Acquires job for a domain object which must be locked before + * calling. If there's already a job running waits up to + * VIR_JOB_WAIT_TIME after which the functions fails reporting + * an error unless @nowait is set. + * + * If @nowait is true this function tries to acquire job and if + * it fails, then it returns immediately without waiting. No + * error is reported in this case. + * + * Returns: 0 on success, + * -2 if unable to start job because of timeout or + * maxQueuedJobs limit, + * -1 otherwise. + */ +int +virDomainObjBeginJobInternal(virDomainObj *obj, + virDomainJobObj *jobObj, + virDomainJob job, + virDomainAgentJob agentJob, + virDomainAsyncJob asyncJob, + bool nowait) +{ + unsigned long long now = 0; + unsigned long long then = 0; + bool nested = job == VIR_JOB_ASYNC_NESTED; + const char *blocker = NULL; + const char *agentBlocker = NULL; + int ret = -1; + unsigned long long duration = 0; + unsigned long long agentDuration = 0; + unsigned long long asyncDuration = 0; + const char *currentAPI = virThreadJobGet(); + + VIR_DEBUG("Starting job: API=%s job=%s agentJob=%s asyncJob=%s " + "(vm=%p name=%s, current job=%s agentJob=%s async=%s)", + NULLSTR(currentAPI), + virDomainJobTypeToString(job), + virDomainAgentJobTypeToString(agentJob), + virDomainAsyncJobTypeToString(asyncJob), + obj, obj->def->name, + virDomainJobTypeToString(jobObj->active), + virDomainAgentJobTypeToString(jobObj->agentActive), + virDomainAsyncJobTypeToString(jobObj->asyncJob)); + + if (virTimeMillisNow(&now) < 0) + return -1; + + jobObj->jobsQueued++; + then = now + VIR_JOB_WAIT_TIME; + + retry: + if (job != VIR_JOB_ASYNC && + job != VIR_JOB_DESTROY && + jobObj->maxQueuedJobs && + jobObj->jobsQueued > jobObj->maxQueuedJobs) { + goto error; + } + + while (!nested && !virDomainNestedJobAllowed(jobObj, job)) { + if (nowait) + goto cleanup; + + VIR_DEBUG("Waiting for async job (vm=%p name=%s)", obj, obj->def->name); + if (virCondWaitUntil(&jobObj->asyncCond, &obj->parent.lock, then) < 0) + goto error; + } + + while (!virDomainObjCanSetJob(jobObj, job, agentJob)) { + if (nowait) + goto cleanup; + + VIR_DEBUG("Waiting for job (vm=%p name=%s)", obj, obj->def->name); + if (virCondWaitUntil(&jobObj->cond, &obj->parent.lock, then) < 0) + goto error; + } + + /* No job is active but a new async job could have been started while obj + * was unlocked, so we need to recheck it. */ + if (!nested && !virDomainNestedJobAllowed(jobObj, job)) + goto retry; + + if (obj->removing) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(obj->def->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, obj->def->name); + goto cleanup; + } + + ignore_value(virTimeMillisNow(&now)); + + if (job) { + virDomainObjResetJob(jobObj); + + if (job != VIR_JOB_ASYNC) { + VIR_DEBUG("Started job: %s (async=%s vm=%p name=%s)", + virDomainJobTypeToString(job), + virDomainAsyncJobTypeToString(jobObj->asyncJob), + obj, obj->def->name); + jobObj->active = job; + jobObj->owner = virThreadSelfID(); + jobObj->ownerAPI = g_strdup(virThreadJobGet()); + jobObj->started = now; + } else { + VIR_DEBUG("Started async job: %s (vm=%p name=%s)", + virDomainAsyncJobTypeToString(asyncJob), + obj, obj->def->name); + virDomainObjResetAsyncJob(jobObj); + jobObj->current = virDomainJobDataInit(jobObj->jobDataPrivateCb); + jobObj->current->status = VIR_DOMAIN_JOB_STATUS_ACTIVE; + jobObj->asyncJob = asyncJob; + jobObj->asyncOwner = virThreadSelfID(); + jobObj->asyncOwnerAPI = g_strdup(virThreadJobGet()); + jobObj->asyncStarted = now; + jobObj->current->started = now; + } + } + + if (agentJob) { + virDomainObjResetAgentJob(jobObj); + VIR_DEBUG("Started agent job: %s (vm=%p name=%s job=%s async=%s)", + virDomainAgentJobTypeToString(agentJob), + obj, obj->def->name, + virDomainJobTypeToString(jobObj->active), + virDomainAsyncJobTypeToString(jobObj->asyncJob)); + jobObj->agentActive = agentJob; + jobObj->agentOwner = virThreadSelfID(); + jobObj->agentOwnerAPI = g_strdup(virThreadJobGet()); + jobObj->agentStarted = now; + } + + if (virDomainTrackJob(job) && jobObj->cb && + jobObj->cb->saveStatusPrivate) + jobObj->cb->saveStatusPrivate(obj); + + return 0; + + error: + ignore_value(virTimeMillisNow(&now)); + if (jobObj->active && jobObj->started) + duration = now - jobObj->started; + if (jobObj->agentActive && jobObj->agentStarted) + agentDuration = now - jobObj->agentStarted; + if (jobObj->asyncJob && jobObj->asyncStarted) + asyncDuration = now - jobObj->asyncStarted; + + VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; " + "current job is (%s, %s, %s) " + "owned by (%llu %s, %llu %s, %llu %s (flags=0x%lx)) " + "for (%llus, %llus, %llus)", + virDomainJobTypeToString(job), + virDomainAgentJobTypeToString(agentJob), + virDomainAsyncJobTypeToString(asyncJob), + NULLSTR(currentAPI), + obj->def->name, + virDomainJobTypeToString(jobObj->active), + virDomainAgentJobTypeToString(jobObj->agentActive), + virDomainAsyncJobTypeToString(jobObj->asyncJob), + jobObj->owner, NULLSTR(jobObj->ownerAPI), + jobObj->agentOwner, NULLSTR(jobObj->agentOwnerAPI), + jobObj->asyncOwner, NULLSTR(jobObj->asyncOwnerAPI), + jobObj->apiFlags, + duration / 1000, agentDuration / 1000, asyncDuration / 1000); + + if (job) { + if (nested || virDomainNestedJobAllowed(jobObj, job)) + blocker = jobObj->ownerAPI; + else + blocker = jobObj->asyncOwnerAPI; + } + + if (agentJob) + agentBlocker = jobObj->agentOwnerAPI; + + if (errno == ETIMEDOUT) { + if (blocker && agentBlocker) { + virReportError(VIR_ERR_OPERATION_TIMEOUT, + _("cannot acquire state change " + "lock (held by monitor=%s agent=%s)"), + blocker, agentBlocker); + } else if (blocker) { + virReportError(VIR_ERR_OPERATION_TIMEOUT, + _("cannot acquire state change " + "lock (held by monitor=%s)"), + blocker); + } else if (agentBlocker) { + virReportError(VIR_ERR_OPERATION_TIMEOUT, + _("cannot acquire state change " + "lock (held by agent=%s)"), + agentBlocker); + } else { + virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", + _("cannot acquire state change lock")); + } + ret = -2; + } else if (jobObj->maxQueuedJobs && + jobObj->jobsQueued > jobObj->maxQueuedJobs) { + if (blocker && agentBlocker) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("cannot acquire state change " + "lock (held by monitor=%s agent=%s) " + "due to max_queued limit"), + blocker, agentBlocker); + } else if (blocker) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("cannot acquire state change " + "lock (held by monitor=%s) " + "due to max_queued limit"), + blocker); + } else if (agentBlocker) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("cannot acquire state change " + "lock (held by agent=%s) " + "due to max_queued limit"), + agentBlocker); + } else { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("cannot acquire state change lock " + "due to max_queued limit")); + } + ret = -2; + } else { + virReportSystemError(errno, "%s", _("cannot acquire job mutex")); + } + + cleanup: + jobObj->jobsQueued--; + return ret; +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 334b59c465..d7409c05f0 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -234,3 +234,11 @@ bool virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob); bool virDomainObjCanSetJob(virDomainJobObj *job, virDomainJob newJob, virDomainAgentJob newAgentJob); + +int virDomainObjBeginJobInternal(virDomainObj *obj, + virDomainJobObj *jobObj, + virDomainJob job, + virDomainAgentJob agentJob, + virDomainAsyncJob asyncJob, + bool nowait) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f739259375..08571cd4b4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1596,6 +1596,7 @@ virDomainJobStatusToType; virDomainJobTypeFromString; virDomainJobTypeToString; virDomainNestedJobAllowed; +virDomainObjBeginJobInternal; virDomainObjCanSetJob; virDomainObjClearJob; virDomainObjInitJob; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 66a91a3e4f..a6ea7b2f58 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -697,248 +697,6 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj) priv->job.asyncOwner = 0; } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - -/** - * qemuDomainObjBeginJobInternal: - * @obj: domain object - * @job: virDomainJob to start - * @asyncJob: virDomainAsyncJob to start - * @nowait: don't wait trying to acquire @job - * - * Acquires job for a domain object which must be locked before - * calling. If there's already a job running waits up to - * QEMU_JOB_WAIT_TIME after which the functions fails reporting - * an error unless @nowait is set. - * - * If @nowait is true this function tries to acquire job and if - * it fails, then it returns immediately without waiting. No - * error is reported in this case. - * - * Returns: 0 on success, - * -2 if unable to start job because of timeout or - * maxQueuedJobs limit, - * -1 otherwise. - */ -static int ATTRIBUTE_NONNULL(1) -qemuDomainObjBeginJobInternal(virDomainObj *obj, - virDomainJob job, - virDomainAgentJob agentJob, - virDomainAsyncJob asyncJob, - bool nowait) -{ - qemuDomainObjPrivate *priv = obj->privateData; - unsigned long long now; - unsigned long long then; - bool nested = job == VIR_JOB_ASYNC_NESTED; - const char *blocker = NULL; - const char *agentBlocker = NULL; - int ret = -1; - unsigned long long duration = 0; - unsigned long long agentDuration = 0; - unsigned long long asyncDuration = 0; - const char *currentAPI = virThreadJobGet(); - - VIR_DEBUG("Starting job: API=%s job=%s agentJob=%s asyncJob=%s " - "(vm=%p name=%s, current job=%s agentJob=%s async=%s)", - NULLSTR(currentAPI), - virDomainJobTypeToString(job), - virDomainAgentJobTypeToString(agentJob), - virDomainAsyncJobTypeToString(asyncJob), - obj, obj->def->name, - virDomainJobTypeToString(priv->job.active), - virDomainAgentJobTypeToString(priv->job.agentActive), - virDomainAsyncJobTypeToString(priv->job.asyncJob)); - - if (virTimeMillisNow(&now) < 0) - return -1; - - priv->job.jobsQueued++; - then = now + QEMU_JOB_WAIT_TIME; - - retry: - if (job != VIR_JOB_ASYNC && - job != VIR_JOB_DESTROY && - priv->job.maxQueuedJobs && - priv->job.jobsQueued > priv->job.maxQueuedJobs) { - goto error; - } - - while (!nested && !virDomainNestedJobAllowed(&priv->job, job)) { - if (nowait) - goto cleanup; - - VIR_DEBUG("Waiting for async job (vm=%p name=%s)", obj, obj->def->name); - if (virCondWaitUntil(&priv->job.asyncCond, &obj->parent.lock, then) < 0) - goto error; - } - - while (!virDomainObjCanSetJob(&priv->job, job, agentJob)) { - if (nowait) - goto cleanup; - - VIR_DEBUG("Waiting for job (vm=%p name=%s)", obj, obj->def->name); - if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) - goto error; - } - - /* No job is active but a new async job could have been started while obj - * was unlocked, so we need to recheck it. */ - if (!nested && !virDomainNestedJobAllowed(&priv->job, job)) - goto retry; - - if (obj->removing) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - - virUUIDFormat(obj->def->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), - uuidstr, obj->def->name); - goto cleanup; - } - - ignore_value(virTimeMillisNow(&now)); - - if (job) { - virDomainObjResetJob(&priv->job); - - if (job != VIR_JOB_ASYNC) { - VIR_DEBUG("Started job: %s (async=%s vm=%p name=%s)", - virDomainJobTypeToString(job), - virDomainAsyncJobTypeToString(priv->job.asyncJob), - obj, obj->def->name); - priv->job.active = job; - priv->job.owner = virThreadSelfID(); - priv->job.ownerAPI = g_strdup(virThreadJobGet()); - priv->job.started = now; - } else { - VIR_DEBUG("Started async job: %s (vm=%p name=%s)", - virDomainAsyncJobTypeToString(asyncJob), - obj, obj->def->name); - virDomainObjResetAsyncJob(&priv->job); - priv->job.current = virDomainJobDataInit(priv->job.jobDataPrivateCb); - priv->job.current->status = VIR_DOMAIN_JOB_STATUS_ACTIVE; - priv->job.asyncJob = asyncJob; - priv->job.asyncOwner = virThreadSelfID(); - priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); - priv->job.asyncStarted = now; - priv->job.current->started = now; - } - } - - if (agentJob) { - virDomainObjResetAgentJob(&priv->job); - - VIR_DEBUG("Started agent job: %s (vm=%p name=%s job=%s async=%s)", - virDomainAgentJobTypeToString(agentJob), - obj, obj->def->name, - virDomainJobTypeToString(priv->job.active), - virDomainAsyncJobTypeToString(priv->job.asyncJob)); - priv->job.agentActive = agentJob; - priv->job.agentOwner = virThreadSelfID(); - priv->job.agentOwnerAPI = g_strdup(virThreadJobGet()); - priv->job.agentStarted = now; - } - - if (virDomainTrackJob(job) && priv->job.cb) - priv->job.cb->saveStatusPrivate(obj); - - return 0; - - error: - ignore_value(virTimeMillisNow(&now)); - if (priv->job.active && priv->job.started) - duration = now - priv->job.started; - if (priv->job.agentActive && priv->job.agentStarted) - agentDuration = now - priv->job.agentStarted; - if (priv->job.asyncJob && priv->job.asyncStarted) - asyncDuration = now - priv->job.asyncStarted; - - VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; " - "current job is (%s, %s, %s) " - "owned by (%llu %s, %llu %s, %llu %s (flags=0x%lx)) " - "for (%llus, %llus, %llus)", - virDomainJobTypeToString(job), - virDomainAgentJobTypeToString(agentJob), - virDomainAsyncJobTypeToString(asyncJob), - NULLSTR(currentAPI), - obj->def->name, - virDomainJobTypeToString(priv->job.active), - virDomainAgentJobTypeToString(priv->job.agentActive), - virDomainAsyncJobTypeToString(priv->job.asyncJob), - priv->job.owner, NULLSTR(priv->job.ownerAPI), - priv->job.agentOwner, NULLSTR(priv->job.agentOwnerAPI), - priv->job.asyncOwner, NULLSTR(priv->job.asyncOwnerAPI), - priv->job.apiFlags, - duration / 1000, agentDuration / 1000, asyncDuration / 1000); - - if (job) { - if (nested || virDomainNestedJobAllowed(&priv->job, job)) - blocker = priv->job.ownerAPI; - else - blocker = priv->job.asyncOwnerAPI; - } - - if (agentJob) - agentBlocker = priv->job.agentOwnerAPI; - - if (errno == ETIMEDOUT) { - if (blocker && agentBlocker) { - virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change " - "lock (held by monitor=%s agent=%s)"), - blocker, agentBlocker); - } else if (blocker) { - virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change " - "lock (held by monitor=%s)"), - blocker); - } else if (agentBlocker) { - virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change " - "lock (held by agent=%s)"), - agentBlocker); - } else { - virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", - _("cannot acquire state change lock")); - } - ret = -2; - } else if (priv->job.maxQueuedJobs && - priv->job.jobsQueued > priv->job.maxQueuedJobs) { - if (blocker && agentBlocker) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change " - "lock (held by monitor=%s agent=%s) " - "due to max_queued limit"), - blocker, agentBlocker); - } else if (blocker) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change " - "lock (held by monitor=%s) " - "due to max_queued limit"), - blocker); - } else if (agentBlocker) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change " - "lock (held by agent=%s) " - "due to max_queued limit"), - agentBlocker); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("cannot acquire state change lock " - "due to max_queued limit")); - } - ret = -2; - } else { - virReportSystemError(errno, "%s", _("cannot acquire job mutex")); - } - - cleanup: - priv->job.jobsQueued--; - return ret; -} - /* * obj must be locked before calling * @@ -950,9 +708,11 @@ qemuDomainObjBeginJobInternal(virDomainObj *obj, int qemuDomainObjBeginJob(virDomainObj *obj, virDomainJob job) { - if (qemuDomainObjBeginJobInternal(obj, job, - VIR_AGENT_JOB_NONE, - VIR_ASYNC_JOB_NONE, false) < 0) + qemuDomainObjPrivate *priv = obj->privateData; + + if (virDomainObjBeginJobInternal(obj, &priv->job, job, + VIR_AGENT_JOB_NONE, + VIR_ASYNC_JOB_NONE, false) < 0) return -1; return 0; } @@ -968,9 +728,11 @@ int qemuDomainObjBeginAgentJob(virDomainObj *obj, virDomainAgentJob agentJob) { - return qemuDomainObjBeginJobInternal(obj, VIR_JOB_NONE, - agentJob, - VIR_ASYNC_JOB_NONE, false); + qemuDomainObjPrivate *priv = obj->privateData; + + return virDomainObjBeginJobInternal(obj, &priv->job, VIR_JOB_NONE, + agentJob, + VIR_ASYNC_JOB_NONE, false); } int qemuDomainObjBeginAsyncJob(virDomainObj *obj, @@ -978,11 +740,11 @@ int qemuDomainObjBeginAsyncJob(virDomainObj *obj, virDomainJobOperation operation, unsigned long apiFlags) { - qemuDomainObjPrivate *priv; + qemuDomainObjPrivate *priv = obj->privateData; - if (qemuDomainObjBeginJobInternal(obj, VIR_JOB_ASYNC, - VIR_AGENT_JOB_NONE, - asyncJob, false) < 0) + if (virDomainObjBeginJobInternal(obj, &priv->job, VIR_JOB_ASYNC, + VIR_AGENT_JOB_NONE, + asyncJob, false) < 0) return -1; priv = obj->privateData; @@ -1009,11 +771,11 @@ qemuDomainObjBeginNestedJob(virDomainObj *obj, priv->job.asyncOwner); } - return qemuDomainObjBeginJobInternal(obj, - VIR_JOB_ASYNC_NESTED, - VIR_AGENT_JOB_NONE, - VIR_ASYNC_JOB_NONE, - false); + return virDomainObjBeginJobInternal(obj, &priv->job, + VIR_JOB_ASYNC_NESTED, + VIR_AGENT_JOB_NONE, + VIR_ASYNC_JOB_NONE, + false); } /** @@ -1032,9 +794,11 @@ int qemuDomainObjBeginJobNowait(virDomainObj *obj, virDomainJob job) { - return qemuDomainObjBeginJobInternal(obj, job, - VIR_AGENT_JOB_NONE, - VIR_ASYNC_JOB_NONE, true); + qemuDomainObjPrivate *priv = obj->privateData; + + return virDomainObjBeginJobInternal(obj, &priv->job, job, + VIR_AGENT_JOB_NONE, + VIR_ASYNC_JOB_NONE, true); } /* -- 2.37.2

The following patches move job object as a member into the domain object. Because of this, domain_conf (where the domain object is defined) needs to import the file with the job object. It makes sense to move jobs to the same level as the domain_conf: into src/conf/ Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- po/POTFILES | 2 +- src/ch/ch_domain.h | 2 +- src/conf/meson.build | 1 + .../domain_job.c => conf/virdomainjob.c} | 6 +-- .../domain_job.h => conf/virdomainjob.h} | 2 +- src/hypervisor/meson.build | 1 - src/libvirt_private.syms | 44 +++++++++---------- src/libxl/libxl_domain.c | 1 - src/libxl/libxl_domain.h | 2 +- src/lxc/lxc_domain.c | 1 - src/lxc/lxc_domain.h | 2 +- src/qemu/qemu_domainjob.h | 2 +- 12 files changed, 32 insertions(+), 34 deletions(-) rename src/{hypervisor/domain_job.c => conf/virdomainjob.c} (99%) rename src/{hypervisor/domain_job.h => conf/virdomainjob.h} (99%) diff --git a/po/POTFILES b/po/POTFILES index b9577e840d..169e2a41dc 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -53,6 +53,7 @@ src/conf/storage_conf.c src/conf/storage_encryption_conf.c src/conf/storage_source_conf.c src/conf/virchrdev.c +src/conf/virdomainjob.c src/conf/virdomainmomentobjlist.c src/conf/virdomainobjlist.c src/conf/virnetworkobj.c @@ -90,7 +91,6 @@ src/hyperv/hyperv_util.c src/hyperv/hyperv_wmi.c src/hypervisor/domain_cgroup.c src/hypervisor/domain_driver.c -src/hypervisor/domain_job.c src/hypervisor/virclosecallbacks.c src/hypervisor/virhostdev.c src/interface/interface_backend_netcf.c diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index b3bebd6b9a..27efe2feed 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -24,7 +24,7 @@ #include "ch_monitor.h" #include "virchrdev.h" #include "vircgroup.h" -#include "domain_job.h" +#include "virdomainjob.h" /* Give up waiting for mutex after 30 seconds */ #define CH_JOB_WAIT_TIME (1000ull * 30) diff --git a/src/conf/meson.build b/src/conf/meson.build index 5ef494c3ba..5116c23fe3 100644 --- a/src/conf/meson.build +++ b/src/conf/meson.build @@ -20,6 +20,7 @@ domain_conf_sources = [ 'numa_conf.c', 'snapshot_conf.c', 'virdomaincheckpointobjlist.c', + 'virdomainjob.c', 'virdomainmomentobjlist.c', 'virdomainobjlist.c', 'virdomainsnapshotobjlist.c', diff --git a/src/hypervisor/domain_job.c b/src/conf/virdomainjob.c similarity index 99% rename from src/hypervisor/domain_job.c rename to src/conf/virdomainjob.c index 07ee5b4a3d..0515e1d507 100644 --- a/src/hypervisor/domain_job.c +++ b/src/conf/virdomainjob.c @@ -1,5 +1,5 @@ /* - * domain_job.c: job functions shared between hypervisor drivers + * virdomainjob.c: job functions shared between hypervisor drivers * * Copyright (C) 2022 Red Hat, Inc. * SPDX-License-Identifier: LGPL-2.1-or-later @@ -8,7 +8,7 @@ #include <config.h> #include <string.h> -#include "domain_job.h" +#include "virdomainjob.h" #include "viralloc.h" #include "virthreadjob.h" #include "virlog.h" @@ -16,7 +16,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE -VIR_LOG_INIT("hypervisor.domain_job"); +VIR_LOG_INIT("conf.virdomainjob"); VIR_ENUM_IMPL(virDomainJob, diff --git a/src/hypervisor/domain_job.h b/src/conf/virdomainjob.h similarity index 99% rename from src/hypervisor/domain_job.h rename to src/conf/virdomainjob.h index d7409c05f0..bdfdc91935 100644 --- a/src/hypervisor/domain_job.h +++ b/src/conf/virdomainjob.h @@ -1,5 +1,5 @@ /* - * domain_job.h: job functions shared between hypervisor drivers + * virdomainjob.h: job functions shared between hypervisor drivers * * Copyright (C) 2022 Red Hat, Inc. * SPDX-License-Identifier: LGPL-2.1-or-later diff --git a/src/hypervisor/meson.build b/src/hypervisor/meson.build index 7532f30ee2..f35565b16b 100644 --- a/src/hypervisor/meson.build +++ b/src/hypervisor/meson.build @@ -3,7 +3,6 @@ hypervisor_sources = [ 'domain_driver.c', 'virclosecallbacks.c', 'virhostdev.c', - 'domain_job.c', ] stateful_driver_source_files += files(hypervisor_sources) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 08571cd4b4..5077db9c6b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1175,6 +1175,28 @@ virDomainCheckpointUpdateRelations; virDomainListCheckpoints; +#conf/virdomainjob.h +virDomainAgentJobTypeToString; +virDomainAsyncJobTypeFromString; +virDomainAsyncJobTypeToString; +virDomainJobDataCopy; +virDomainJobDataFree; +virDomainJobDataInit; +virDomainJobStatusToType; +virDomainJobTypeFromString; +virDomainJobTypeToString; +virDomainNestedJobAllowed; +virDomainObjBeginJobInternal; +virDomainObjCanSetJob; +virDomainObjClearJob; +virDomainObjInitJob; +virDomainObjPreserveJob; +virDomainObjResetAgentJob; +virDomainObjResetAsyncJob; +virDomainObjResetJob; +virDomainTrackJob; + + # conf/virdomainmomentobjlist.h virDomainMomentDropChildren; virDomainMomentDropParent; @@ -1585,28 +1607,6 @@ virDomainDriverParseBlkioDeviceStr; virDomainDriverSetupPersistentDefBlkioParams; -# hypervisor/domain_job.h -virDomainAgentJobTypeToString; -virDomainAsyncJobTypeFromString; -virDomainAsyncJobTypeToString; -virDomainJobDataCopy; -virDomainJobDataFree; -virDomainJobDataInit; -virDomainJobStatusToType; -virDomainJobTypeFromString; -virDomainJobTypeToString; -virDomainNestedJobAllowed; -virDomainObjBeginJobInternal; -virDomainObjCanSetJob; -virDomainObjClearJob; -virDomainObjInitJob; -virDomainObjPreserveJob; -virDomainObjResetAgentJob; -virDomainObjResetAsyncJob; -virDomainObjResetJob; -virDomainTrackJob; - - # hypervisor/virclosecallbacks.h virCloseCallbacksGet; virCloseCallbacksNew; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 6695ec670e..aadb13f461 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -37,7 +37,6 @@ #include "xen_common.h" #include "driver.h" #include "domain_validate.h" -#include "domain_job.h" #define VIR_FROM_THIS VIR_FROM_LIBXL diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 8ad56f1e88..451e76e311 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -24,7 +24,7 @@ #include "libxl_conf.h" #include "virchrdev.h" -#include "domain_job.h" +#include "virdomainjob.h" typedef struct _libxlDomainObjPrivate libxlDomainObjPrivate; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 61e59ec726..f234aaf39c 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -29,7 +29,6 @@ #include "virsystemd.h" #include "virinitctl.h" #include "domain_driver.h" -#include "domain_job.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index 82c36eb940..db622acc86 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -25,7 +25,7 @@ #include "lxc_conf.h" #include "lxc_monitor.h" #include "virenum.h" -#include "domain_job.h" +#include "virdomainjob.h" typedef enum { diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index bb3c7ede14..23eadc26a7 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -20,7 +20,7 @@ #include <glib-object.h> #include "qemu_monitor.h" -#include "domain_job.h" +#include "virdomainjob.h" typedef enum { -- 2.37.2

This patch adds the generalized job object into the domain object so that it can be used by all drivers without the need to extract it from the private data. Because of this, the job object needs to be created and set during the creation of the domain object. This patch also extends xmlopt with possible job config containing virDomainJobObj callbacks, its private data callbacks and one variable (maxQueuedJobs). This patch includes: * addition of virDomainJobObj into virDomainObj (used in the following patches) * extending xmlopt with job config structure * new function for freeing the virDomainJobObj Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- src/bhyve/bhyve_domain.c | 2 +- src/ch/ch_conf.c | 2 +- src/conf/domain_conf.c | 13 ++++++++++++- src/conf/domain_conf.h | 16 +++++++++++++++- src/conf/virconftypes.h | 2 ++ src/conf/virdomainjob.c | 11 +++++++++++ src/conf/virdomainjob.h | 5 ++++- src/hyperv/hyperv_driver.c | 2 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_conf.c | 3 ++- src/qemu/qemu_process.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/bhyveargv2xmltest.c | 2 +- tests/testutils.c | 2 +- 22 files changed, 62 insertions(+), 19 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 69555a3efc..b7b2db57b8 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -221,7 +221,7 @@ virBhyveDriverCreateXMLConf(struct _bhyveConn *driver) return virDomainXMLOptionNew(&virBhyveDriverDomainDefParserConfig, &virBhyveDriverPrivateDataCallbacks, &virBhyveDriverDomainXMLNamespace, - NULL, NULL); + NULL, NULL, NULL); } diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 775596e9f5..0d07fa270c 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -110,7 +110,7 @@ chDomainXMLConfInit(virCHDriver *driver) virCHDriverDomainDefParserConfig.priv = driver; return virDomainXMLOptionNew(&virCHDriverDomainDefParserConfig, &virCHDriverPrivateDataCallbacks, - NULL, NULL, NULL); + NULL, NULL, NULL, NULL); } virCHDriverConfig * diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 237f1d6835..35ac2bb1c2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1604,7 +1604,8 @@ virDomainXMLOptionNew(virDomainDefParserConfig *config, virDomainXMLPrivateDataCallbacks *priv, virXMLNamespace *xmlns, virDomainABIStability *abi, - virSaveCookieCallbacks *saveCookie) + virSaveCookieCallbacks *saveCookie, + virDomainJobObjConfig *jobConfig) { virDomainXMLOption *xmlopt; @@ -1629,6 +1630,9 @@ virDomainXMLOptionNew(virDomainDefParserConfig *config, if (saveCookie) xmlopt->saveCookie = *saveCookie; + if (jobConfig) + xmlopt->jobObjConfig = *jobConfig; + /* Technically this forbids to use one of Xerox's MAC address prefixes in * our hypervisor drivers. This shouldn't ever be a problem. * @@ -3857,6 +3861,7 @@ static void virDomainObjDispose(void *obj) virDomainObjDeprecationFree(dom); virDomainSnapshotObjListFree(dom->snapshots); virDomainCheckpointObjListFree(dom->checkpoints); + virDomainJobObjFree(dom->job); } virDomainObj * @@ -3889,6 +3894,12 @@ virDomainObjNew(virDomainXMLOption *xmlopt) if (!(domain->checkpoints = virDomainCheckpointObjListNew())) goto error; + domain->job = g_new0(virDomainJobObj, 1); + if (virDomainObjInitJob(domain->job, + &xmlopt->jobObjConfig.cb, + &xmlopt->jobObjConfig.jobDataPrivateCb) < 0) + goto error; + virObjectLock(domain); virDomainObjSetState(domain, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2b1497d78d..42fa2a4400 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -56,6 +56,7 @@ #include "virsavecookie.h" #include "virresctrl.h" #include "virenum.h" +#include "virdomainjob.h" /* Flags for the 'type' field in virDomainDeviceDef */ typedef enum { @@ -3093,6 +3094,8 @@ struct _virDomainObj { virObjectLockable parent; virCond cond; + virDomainJobObj *job; + pid_t pid; /* 0 for no PID, avoid negative values like -1 */ virDomainStateReason state; @@ -3277,11 +3280,19 @@ struct _virDomainABIStability { virDomainABIStabilityDomain domain; }; + +struct _virDomainJobObjConfig { + virDomainObjPrivateJobCallbacks cb; + virDomainJobDataPrivateDataCallbacks jobDataPrivateCb; + unsigned int maxQueuedJobs; +}; + virDomainXMLOption *virDomainXMLOptionNew(virDomainDefParserConfig *config, virDomainXMLPrivateDataCallbacks *priv, virXMLNamespace *xmlns, virDomainABIStability *abi, - virSaveCookieCallbacks *saveCookie); + virSaveCookieCallbacks *saveCookie, + virDomainJobObjConfig *jobConfig); virSaveCookieCallbacks * virDomainXMLOptionGetSaveCookie(virDomainXMLOption *xmlopt); @@ -3321,6 +3332,9 @@ struct _virDomainXMLOption { /* Snapshot postparse callbacks */ virDomainMomentPostParseCallback momentPostParse; + + /* virDomainJobObj callbacks, private data callbacks and defaults */ + virDomainJobObjConfig jobObjConfig; }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainXMLOption, virObjectUnref); diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h index c3f1c5fa01..154805091a 100644 --- a/src/conf/virconftypes.h +++ b/src/conf/virconftypes.h @@ -150,6 +150,8 @@ typedef struct _virDomainIdMapEntry virDomainIdMapEntry; typedef struct _virDomainInputDef virDomainInputDef; +typedef struct _virDomainJobObjConfig virDomainJobObjConfig; + typedef struct _virDomainKeyWrapDef virDomainKeyWrapDef; typedef struct _virDomainLeaseDef virDomainLeaseDef; diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index 5ab4bdc18b..a073ff08cd 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -13,6 +13,7 @@ #include "virthreadjob.h" #include "virlog.h" #include "virtime.h" +#include "domain_conf.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -230,6 +231,16 @@ virDomainObjClearJob(virDomainJobObj *job) g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); } +void +virDomainJobObjFree(virDomainJobObj *job) +{ + if (!job) + return; + + virDomainObjClearJob(job); + g_free(job); +} + bool virDomainTrackJob(virDomainJob job) { diff --git a/src/conf/virdomainjob.h b/src/conf/virdomainjob.h index bdfdc91935..091d951aa6 100644 --- a/src/conf/virdomainjob.h +++ b/src/conf/virdomainjob.h @@ -11,7 +11,8 @@ #include "virenum.h" #include "virthread.h" #include "virbuffer.h" -#include "domain_conf.h" +#include "virconftypes.h" +#include "virxml.h" #define JOB_MASK(job) (job == 0 ? 0 : 1 << (job - 1)) #define VIR_JOB_DEFAULT_MASK \ @@ -227,6 +228,8 @@ int virDomainObjPreserveJob(virDomainJobObj *currJob, void virDomainObjClearJob(virDomainJobObj *job); G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, virDomainObjClearJob); +void virDomainJobObjFree(virDomainJobObj *job); + bool virDomainTrackJob(virDomainJob job); bool virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob); diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 288c01ad14..3929e27e09 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1766,7 +1766,7 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, goto cleanup; /* init xmlopt for domain XML */ - priv->xmlopt = virDomainXMLOptionNew(&hypervDomainDefParserConfig, NULL, NULL, NULL, NULL); + priv->xmlopt = virDomainXMLOptionNew(&hypervDomainDefParserConfig, NULL, NULL, NULL, NULL, NULL); if (hypervGetOperatingSystem(priv, &os) < 0) goto cleanup; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5077db9c6b..cd0b94297c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1182,6 +1182,7 @@ virDomainAsyncJobTypeToString; virDomainJobDataCopy; virDomainJobDataFree; virDomainJobDataInit; +virDomainJobObjFree; virDomainJobStatusToType; virDomainJobTypeFromString; virDomainJobTypeToString; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 06f338ef90..918303c8d0 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -2486,5 +2486,5 @@ libxlCreateXMLConf(libxlDriverPrivate *driver) return virDomainXMLOptionNew(&libxlDomainDefParserConfig, &libxlDomainXMLPrivateDataCallbacks, &libxlDriverDomainXMLNamespace, - NULL, NULL); + NULL, NULL, NULL); } diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 7834801fb5..fefe63bf20 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -189,7 +189,7 @@ lxcDomainXMLConfInit(virLXCDriver *driver, const char *defsecmodel) return virDomainXMLOptionNew(&virLXCDriverDomainDefParserConfig, &virLXCDriverPrivateDataCallbacks, &virLXCDriverDomainXMLNamespace, - NULL, NULL); + NULL, NULL, NULL); } diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c94f9b8577..c28d0e9f43 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -1062,5 +1062,5 @@ virDomainXMLOption *openvzXMLOption(struct openvz_driver *driver) { openvzDomainDefParserConfig.priv = driver; return virDomainXMLOptionNew(&openvzDomainDefParserConfig, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3b75cdeb95..2809ae53b9 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1278,7 +1278,8 @@ virQEMUDriverCreateXMLConf(virQEMUDriver *driver, &virQEMUDriverPrivateDataCallbacks, &virQEMUDriverDomainXMLNamespace, &virQEMUDriverDomainABIStability, - &virQEMUDriverDomainSaveCookie); + &virQEMUDriverDomainSaveCookie, + NULL); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 32f03ff79a..251bca4bdf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9295,7 +9295,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMP *proc) monConfig.data.nix.path = proc->monpath; monConfig.data.nix.listen = false; - if (!(xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL)) || + if (!(xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL, NULL)) || !(proc->vm = virDomainObjNew(xmlopt)) || !(proc->vm->def = virDomainDefNew(xmlopt))) return -1; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 2d0bc99c73..f338488da3 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -632,7 +632,7 @@ get_definition(vahControl * ctl, const char *xmlStr) } if (!(ctl->xmlopt = virDomainXMLOptionNew(&virAAHelperDomainDefParserConfig, - NULL, NULL, NULL, NULL))) { + NULL, NULL, NULL, NULL, NULL))) { vah_error(ctl, 0, _("Failed to create XML config object")); return -1; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 641a141b6a..686ff051a8 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -460,7 +460,7 @@ testDriverNew(void) if (!(ret = virObjectLockableNew(testDriverClass))) return NULL; - if (!(ret->xmlopt = virDomainXMLOptionNew(&config, &privatecb, &ns, NULL, NULL)) || + if (!(ret->xmlopt = virDomainXMLOptionNew(&config, &privatecb, &ns, NULL, NULL, NULL)) || !(ret->eventState = virObjectEventStateNew()) || !(ret->ifaces = virInterfaceObjListNew()) || !(ret->domains = virDomainObjListNew()) || diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index e249980195..bd77641d39 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -143,7 +143,7 @@ vboxDriverObjNew(void) if (!(driver->caps = vboxCapsInit()) || !(driver->xmlopt = virDomainXMLOptionNew(&vboxDomainDefParserConfig, - NULL, NULL, NULL, NULL))) + NULL, NULL, NULL, NULL, NULL))) goto cleanup; return driver; diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 2a18d73988..3c578434f3 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -139,7 +139,7 @@ vmwareDomainXMLConfigInit(struct vmware_driver *driver) .free = vmwareDataFreeFunc }; vmwareDomainDefParserConfig.priv = driver; return virDomainXMLOptionNew(&vmwareDomainDefParserConfig, &priv, - NULL, NULL, NULL); + NULL, NULL, NULL, NULL); } static virDrvOpenStatus diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index fa5cc56146..bf0dba17d8 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -696,7 +696,7 @@ virVMXDomainXMLConfInit(virCaps *caps) { virVMXDomainDefParserConfig.priv = caps; return virDomainXMLOptionNew(&virVMXDomainDefParserConfig, NULL, - &virVMXDomainXMLNamespace, NULL, NULL); + &virVMXDomainXMLNamespace, NULL, NULL, NULL); } char * diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 017c084ede..571d895167 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -331,7 +331,7 @@ vzDriverObjNew(void) if (!(driver->caps = vzBuildCapabilities()) || !(driver->xmlopt = virDomainXMLOptionNew(&vzDomainDefParserConfig, &vzDomainXMLPrivateDataCallbacksPtr, - NULL, NULL, NULL)) || + NULL, NULL, NULL, NULL)) || !(driver->domains = virDomainObjListNew()) || !(driver->domainEventState = virObjectEventStateNew()) || (vzInitVersion(driver) < 0) || diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index 2ccc1379b9..92189a2e58 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -113,7 +113,7 @@ mymain(void) if ((driver.caps = virBhyveCapsBuild()) == NULL) return EXIT_FAILURE; - if ((driver.xmlopt = virDomainXMLOptionNew(NULL, NULL, + if ((driver.xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL, NULL)) == NULL) return EXIT_FAILURE; diff --git a/tests/testutils.c b/tests/testutils.c index 30f91dcd28..8fe624f029 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -989,7 +989,7 @@ static virDomainDefParserConfig virTestGenericDomainDefParserConfig = { virDomainXMLOption *virTestGenericDomainXMLConfInit(void) { return virDomainXMLOptionNew(&virTestGenericDomainDefParserConfig, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); } -- 2.37.2

On Fri, Sep 16, 2022 at 13:30:07 +0100, Daniel P. Berrangé wrote: The root cause here is that the virDomainJobObj now copies the pointer to virDomainObjPrivateJobCallbacks from 'xmlopt' without ensuring that the lifetime of the 'xmlopt' objects is longer than the lifetime of domains. At least in case of the 'test' driver that pre-condition is not met and thus it dereferences pointers to freed memory. A simple demonstration of the lifetime constraint is that the following patch fixes the invalid read: diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 686ff051a8..f574756518 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -154,8 +154,8 @@ testDriverDispose(void *obj) size_t i; virObjectUnref(driver->caps); - virObjectUnref(driver->xmlopt); virObjectUnref(driver->domains); + virObjectUnref(driver->xmlopt); virNodeDeviceObjListFree(driver->devs); virObjectUnref(driver->networks); virObjectUnref(driver->ifaces); A proper fix will be to not rely on stolen pointers though as doing this is too fragile in other cases.

This patch uses the job object directly in the domain object and removes the job object from private data of all drivers that use it as well as other relevant code (initializing and freeing the structure). Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- src/ch/ch_domain.c | 29 ++-- src/ch/ch_domain.h | 2 - src/conf/domain_conf.c | 1 + src/libxl/libxl_domain.c | 31 ++-- src/libxl/libxl_domain.h | 2 - src/libxl/libxl_driver.c | 12 +- src/lxc/lxc_domain.c | 28 ++-- src/lxc/lxc_domain.h | 2 - src/qemu/qemu_backup.c | 18 +-- src/qemu/qemu_conf.c | 6 +- src/qemu/qemu_domain.c | 69 +++++---- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_domainjob.c | 223 +++++++++++------------------ src/qemu/qemu_domainjob.h | 2 - src/qemu/qemu_driver.c | 72 +++++----- src/qemu/qemu_migration.c | 193 ++++++++++++------------- src/qemu/qemu_migration_cookie.c | 17 ++- src/qemu/qemu_migration_cookie.h | 3 +- src/qemu/qemu_migration_params.c | 8 +- src/qemu/qemu_process.c | 73 +++++----- src/qemu/qemu_snapshot.c | 2 +- tests/qemumigrationcookiexmltest.c | 3 +- 22 files changed, 347 insertions(+), 452 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 89b494b388..9ddf9a8584 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -44,7 +44,6 @@ VIR_LOG_INIT("ch.ch_domain"); int virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job) { - virCHDomainObjPrivate *priv = obj->privateData; unsigned long long now; unsigned long long then; @@ -52,16 +51,16 @@ virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job) return -1; then = now + CH_JOB_WAIT_TIME; - while (priv->job.active) { + while (obj->job->active) { VIR_DEBUG("Wait normal job condition for starting job: %s", virDomainJobTypeToString(job)); - if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) { + if (virCondWaitUntil(&obj->job->cond, &obj->parent.lock, then) < 0) { VIR_WARN("Cannot start job (%s) for domain %s;" " current job is (%s) owned by (%llu)", virDomainJobTypeToString(job), obj->def->name, - virDomainJobTypeToString(priv->job.active), - priv->job.owner); + virDomainJobTypeToString(obj->job->active), + obj->job->owner); if (errno == ETIMEDOUT) virReportError(VIR_ERR_OPERATION_TIMEOUT, @@ -73,11 +72,11 @@ virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job) } } - virDomainObjResetJob(&priv->job); + virDomainObjResetJob(obj->job); VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job)); - priv->job.active = job; - priv->job.owner = virThreadSelfID(); + obj->job->active = job; + obj->job->owner = virThreadSelfID(); return 0; } @@ -91,14 +90,13 @@ virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job) void virCHDomainObjEndJob(virDomainObj *obj) { - virCHDomainObjPrivate *priv = obj->privateData; - virDomainJob job = priv->job.active; + virDomainJob job = obj->job->active; VIR_DEBUG("Stopping job: %s", virDomainJobTypeToString(job)); - virDomainObjResetJob(&priv->job); - virCondSignal(&priv->job.cond); + virDomainObjResetJob(obj->job); + virCondSignal(&obj->job->cond); } void @@ -117,13 +115,7 @@ virCHDomainObjPrivateAlloc(void *opaque) priv = g_new0(virCHDomainObjPrivate, 1); - if (virDomainObjInitJob(&priv->job, NULL, NULL) < 0) { - g_free(priv); - return NULL; - } - if (!(priv->chrdevs = virChrdevAlloc())) { - virDomainObjClearJob(&priv->job); g_free(priv); return NULL; } @@ -138,7 +130,6 @@ virCHDomainObjPrivateFree(void *data) virCHDomainObjPrivate *priv = data; virChrdevFree(priv->chrdevs); - virDomainObjClearJob(&priv->job); g_free(priv->machineName); g_free(priv); } diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index 27efe2feed..c7dfde601e 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -32,8 +32,6 @@ typedef struct _virCHDomainObjPrivate virCHDomainObjPrivate; struct _virCHDomainObjPrivate { - virDomainJobObj job; - virChrdevs *chrdevs; virCHDriver *driver; virCHMonitor *monitor; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 35ac2bb1c2..4c2cee3052 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -60,6 +60,7 @@ #include "virdomainsnapshotobjlist.h" #include "virdomaincheckpointobjlist.h" #include "virutil.h" +#include "virdomainjob.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index aadb13f461..80a362df46 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -60,7 +60,6 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED, virDomainObj *obj, virDomainJob job) { - libxlDomainObjPrivate *priv = obj->privateData; unsigned long long now; unsigned long long then; @@ -68,19 +67,19 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED, return -1; then = now + LIBXL_JOB_WAIT_TIME; - while (priv->job.active) { + while (obj->job->active) { VIR_DEBUG("Wait normal job condition for starting job: %s", virDomainJobTypeToString(job)); - if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) + if (virCondWaitUntil(&obj->job->cond, &obj->parent.lock, then) < 0) goto error; } - virDomainObjResetJob(&priv->job); + virDomainObjResetJob(obj->job); VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job)); - priv->job.active = job; - priv->job.owner = virThreadSelfID(); - priv->job.started = now; + obj->job->active = job; + obj->job->owner = virThreadSelfID(); + obj->job->started = now; return 0; @@ -89,8 +88,8 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED, " current job is (%s) owned by (%llu)", virDomainJobTypeToString(job), obj->def->name, - virDomainJobTypeToString(priv->job.active), - priv->job.owner); + virDomainJobTypeToString(obj->job->active), + obj->job->owner); if (errno == ETIMEDOUT) virReportError(VIR_ERR_OPERATION_TIMEOUT, @@ -116,14 +115,13 @@ void libxlDomainObjEndJob(libxlDriverPrivate *driver G_GNUC_UNUSED, virDomainObj *obj) { - libxlDomainObjPrivate *priv = obj->privateData; - virDomainJob job = priv->job.active; + virDomainJob job = obj->job->active; VIR_DEBUG("Stopping job: %s", virDomainJobTypeToString(job)); - virDomainObjResetJob(&priv->job); - virCondSignal(&priv->job.cond); + virDomainObjResetJob(obj->job); + virCondSignal(&obj->job->cond); } int @@ -158,12 +156,6 @@ libxlDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) return NULL; } - if (virDomainObjInitJob(&priv->job, NULL, NULL) < 0) { - virChrdevFree(priv->devs); - g_free(priv); - return NULL; - } - return priv; } @@ -173,7 +165,6 @@ libxlDomainObjPrivateFree(void *data) libxlDomainObjPrivate *priv = data; g_free(priv->lockState); - virDomainObjClearJob(&priv->job); virChrdevFree(priv->devs); g_free(priv); } diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 451e76e311..9e8804f747 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -37,8 +37,6 @@ struct _libxlDomainObjPrivate { char *lockState; bool lockProcessRunning; - virDomainJobObj job; - bool hookRun; /* true if there was a hook run over this domain */ }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ff6c2f6506..0ae1ee95c4 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5204,7 +5204,6 @@ static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) { - libxlDomainObjPrivate *priv; virDomainObj *vm; int ret = -1; unsigned long long timeElapsed = 0; @@ -5215,8 +5214,7 @@ libxlDomainGetJobInfo(virDomainPtr dom, if (virDomainGetJobInfoEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - priv = vm->privateData; - if (!priv->job.active) { + if (!vm->job->active) { memset(info, 0, sizeof(*info)); info->type = VIR_DOMAIN_JOB_NONE; ret = 0; @@ -5226,7 +5224,7 @@ libxlDomainGetJobInfo(virDomainPtr dom, /* In libxl we don't have an estimated completion time * thus we always set to unbounded and update time * for the active job. */ - if (libxlDomainJobGetTimeElapsed(&priv->job, &timeElapsed) < 0) + if (libxlDomainJobGetTimeElapsed(vm->job, &timeElapsed) < 0) goto cleanup; /* setting only these two attributes is enough because libxl never sets @@ -5248,7 +5246,6 @@ libxlDomainGetJobStats(virDomainPtr dom, int *nparams, unsigned int flags) { - libxlDomainObjPrivate *priv; virDomainObj *vm; int ret = -1; int maxparams = 0; @@ -5263,8 +5260,7 @@ libxlDomainGetJobStats(virDomainPtr dom, if (virDomainGetJobStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - priv = vm->privateData; - if (!priv->job.active) { + if (!vm->job->active) { *type = VIR_DOMAIN_JOB_NONE; *params = NULL; *nparams = 0; @@ -5275,7 +5271,7 @@ libxlDomainGetJobStats(virDomainPtr dom, /* In libxl we don't have an estimated completion time * thus we always set to unbounded and update time * for the active job. */ - if (libxlDomainJobGetTimeElapsed(&priv->job, &timeElapsed) < 0) + if (libxlDomainJobGetTimeElapsed(vm->job, &timeElapsed) < 0) goto cleanup; if (virTypedParamsAddULLong(params, nparams, &maxparams, diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index f234aaf39c..3dddc0a7d4 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -52,7 +52,6 @@ virLXCDomainObjBeginJob(virLXCDriver *driver G_GNUC_UNUSED, virDomainObj *obj, virDomainJob job) { - virLXCDomainObjPrivate *priv = obj->privateData; unsigned long long now; unsigned long long then; @@ -60,18 +59,18 @@ virLXCDomainObjBeginJob(virLXCDriver *driver G_GNUC_UNUSED, return -1; then = now + LXC_JOB_WAIT_TIME; - while (priv->job.active) { + while (obj->job->active) { VIR_DEBUG("Wait normal job condition for starting job: %s", virDomainJobTypeToString(job)); - if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) + if (virCondWaitUntil(&obj->job->cond, &obj->parent.lock, then) < 0) goto error; } - virDomainObjResetJob(&priv->job); + virDomainObjResetJob(obj->job); VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job)); - priv->job.active = job; - priv->job.owner = virThreadSelfID(); + obj->job->active = job; + obj->job->owner = virThreadSelfID(); return 0; @@ -80,8 +79,8 @@ virLXCDomainObjBeginJob(virLXCDriver *driver G_GNUC_UNUSED, " current job is (%s) owned by (%llu)", virDomainJobTypeToString(job), obj->def->name, - virDomainJobTypeToString(priv->job.active), - priv->job.owner); + virDomainJobTypeToString(obj->job->active), + obj->job->owner); if (errno == ETIMEDOUT) virReportError(VIR_ERR_OPERATION_TIMEOUT, @@ -103,14 +102,13 @@ void virLXCDomainObjEndJob(virLXCDriver *driver G_GNUC_UNUSED, virDomainObj *obj) { - virLXCDomainObjPrivate *priv = obj->privateData; - virDomainJob job = priv->job.active; + virDomainJob job = obj->job->active; VIR_DEBUG("Stopping job: %s", virDomainJobTypeToString(job)); - virDomainObjResetJob(&priv->job); - virCondSignal(&priv->job.cond); + virDomainObjResetJob(obj->job); + virCondSignal(&obj->job->cond); } @@ -119,11 +117,6 @@ virLXCDomainObjPrivateAlloc(void *opaque) { virLXCDomainObjPrivate *priv = g_new0(virLXCDomainObjPrivate, 1); - if (virDomainObjInitJob(&priv->job, NULL, NULL) < 0) { - g_free(priv); - return NULL; - } - priv->driver = opaque; return priv; @@ -136,7 +129,6 @@ virLXCDomainObjPrivateFree(void *data) virLXCDomainObjPrivate *priv = data; virCgroupFree(priv->cgroup); - virDomainObjClearJob(&priv->job); g_free(priv); } diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index db622acc86..8cbcc0818c 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -66,8 +66,6 @@ struct _virLXCDomainObjPrivate { virCgroup *cgroup; char *machineName; - - virDomainJobObj job; }; extern virXMLNamespace virLXCDriverDomainXMLNamespace; diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 5280186970..2da520dbc7 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -594,30 +594,30 @@ qemuBackupJobTerminate(virDomainObj *vm, } } - if (priv->job.current) { + if (vm->job->current) { qemuDomainJobDataPrivate *privData = NULL; - qemuDomainJobDataUpdateTime(priv->job.current); + qemuDomainJobDataUpdateTime(vm->job->current); - g_clear_pointer(&priv->job.completed, virDomainJobDataFree); - priv->job.completed = virDomainJobDataCopy(priv->job.current); + g_clear_pointer(&vm->job->completed, virDomainJobDataFree); + vm->job->completed = virDomainJobDataCopy(vm->job->current); - privData = priv->job.completed->privateData; + privData = vm->job->completed->privateData; privData->stats.backup.total = priv->backup->push_total; privData->stats.backup.transferred = priv->backup->push_transferred; privData->stats.backup.tmp_used = priv->backup->pull_tmp_used; privData->stats.backup.tmp_total = priv->backup->pull_tmp_total; - priv->job.completed->status = jobstatus; - priv->job.completed->errmsg = g_strdup(priv->backup->errmsg); + vm->job->completed->status = jobstatus; + vm->job->completed->errmsg = g_strdup(priv->backup->errmsg); qemuDomainEventEmitJobCompleted(priv->driver, vm); } g_clear_pointer(&priv->backup, virDomainBackupDefFree); - if (priv->job.asyncJob == VIR_ASYNC_JOB_BACKUP) + if (vm->job->asyncJob == VIR_ASYNC_JOB_BACKUP) qemuDomainObjEndAsyncJob(vm); } @@ -793,7 +793,7 @@ qemuBackupBegin(virDomainObj *vm, qemuDomainObjSetAsyncJobMask(vm, (VIR_JOB_DEFAULT_MASK | JOB_MASK(VIR_JOB_SUSPEND) | JOB_MASK(VIR_JOB_MODIFY))); - qemuDomainJobSetStatsType(priv->job.current, + qemuDomainJobSetStatsType(vm->job->current, QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP); if (!virDomainObjIsActive(vm)) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2809ae53b9..4f59e5fb07 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1272,14 +1272,18 @@ virDomainXMLOption * virQEMUDriverCreateXMLConf(virQEMUDriver *driver, const char *defsecmodel) { + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + virQEMUDriverDomainDefParserConfig.priv = driver; virQEMUDriverDomainDefParserConfig.defSecModel = defsecmodel; + virQEMUDriverDomainJobConfig.maxQueuedJobs = cfg->maxQueuedJobs; + return virDomainXMLOptionNew(&virQEMUDriverDomainDefParserConfig, &virQEMUDriverPrivateDataCallbacks, &virQEMUDriverDomainXMLNamespace, &virQEMUDriverDomainABIStability, &virQEMUDriverDomainSaveCookie, - NULL); + &virQEMUDriverDomainJobConfig); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fe3ce023a4..ebd3c7478f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -278,7 +278,7 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObj *vm, return -1; if (n > 0) { - if (priv->job.asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) { + if (vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) { VIR_WARN("Found disks marked for migration but we were not " "migrating"); n = 0; @@ -359,14 +359,46 @@ qemuDomainParseJobPrivate(xmlXPathContextPtr ctxt, return 0; } +static void * +qemuJobDataAllocPrivateData(void) +{ + return g_new0(qemuDomainJobDataPrivate, 1); +} + + +static void * +qemuJobDataCopyPrivateData(void *data) +{ + qemuDomainJobDataPrivate *ret = g_new0(qemuDomainJobDataPrivate, 1); + + memcpy(ret, data, sizeof(qemuDomainJobDataPrivate)); + + return ret; +} + -static virDomainObjPrivateJobCallbacks qemuPrivateJobCallbacks = { - .allocJobPrivate = qemuJobAllocPrivate, - .freeJobPrivate = qemuJobFreePrivate, - .resetJobPrivate = qemuJobResetPrivate, - .formatJobPrivate = qemuDomainFormatJobPrivate, - .parseJobPrivate = qemuDomainParseJobPrivate, - .saveStatusPrivate = qemuDomainSaveStatus, +static void +qemuJobDataFreePrivateData(void *data) +{ + g_free(data); +} + + +virDomainJobObjConfig virQEMUDriverDomainJobConfig = { + .cb = { + .allocJobPrivate = qemuJobAllocPrivate, + .freeJobPrivate = qemuJobFreePrivate, + .resetJobPrivate = qemuJobResetPrivate, + .formatJobPrivate = qemuDomainFormatJobPrivate, + .parseJobPrivate = qemuDomainParseJobPrivate, + .saveStatusPrivate = qemuDomainSaveStatus, + }, + .jobDataPrivateCb = { + .allocPrivateData = qemuJobDataAllocPrivateData, + .copyPrivateData = qemuJobDataCopyPrivateData, + .freePrivateData = qemuJobDataFreePrivateData, + }, + .maxQueuedJobs = 0, }; /** @@ -1719,7 +1751,6 @@ qemuDomainObjPrivateFree(void *data) qemuDomainObjPrivateDataClear(priv); virObjectUnref(priv->monConfig); - virDomainObjClearJob(&priv->job); g_free(priv->lockState); g_free(priv->origname); @@ -1757,22 +1788,12 @@ static void * qemuDomainObjPrivateAlloc(void *opaque) { g_autoptr(qemuDomainObjPrivate) priv = g_new0(qemuDomainObjPrivate, 1); - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(opaque); - - if (virDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks, - &qemuJobDataPrivateDataCallbacks) < 0) { - virReportSystemError(errno, "%s", - _("Unable to init qemu driver mutexes")); - return NULL; - } if (!(priv->devs = virChrdevAlloc())) return NULL; priv->blockjobs = virHashNew(virObjectUnref); - priv->job.maxQueuedJobs = cfg->maxQueuedJobs; - /* agent commands block by default, user can choose different behavior */ priv->agentTimeout = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK; priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; @@ -5955,14 +5976,14 @@ qemuDomainObjEnterMonitorInternal(virDomainObj *obj, qemuDomainObjEndJob(obj); return -1; } - } else if (priv->job.asyncOwner == virThreadSelfID()) { + } else if (obj->job->asyncOwner == virThreadSelfID()) { VIR_WARN("This thread seems to be the async job owner; entering" " monitor without asking for a nested job is dangerous"); - } else if (priv->job.owner != virThreadSelfID()) { + } else if (obj->job->owner != virThreadSelfID()) { VIR_WARN("Entering a monitor without owning a job. " "Job %s owner %s (%llu)", - virDomainJobTypeToString(priv->job.active), - priv->job.ownerAPI, priv->job.owner); + virDomainJobTypeToString(obj->job->active), + obj->job->ownerAPI, obj->job->owner); } VIR_DEBUG("Entering monitor (mon=%p vm=%p name=%s)", @@ -6001,7 +6022,7 @@ qemuDomainObjExitMonitor(virDomainObj *obj) if (!hasRefs) priv->mon = NULL; - if (priv->job.active == VIR_JOB_ASYNC_NESTED) + if (obj->job->active == VIR_JOB_ASYNC_NESTED) qemuDomainObjEndJob(obj); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 592ee9805b..ef149b9fa9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -99,8 +99,6 @@ typedef struct _qemuDomainObjPrivate qemuDomainObjPrivate; struct _qemuDomainObjPrivate { virQEMUDriver *driver; - virDomainJobObj job; - virBitmap *namespaces; virEventThread *eventThread; @@ -775,6 +773,7 @@ extern virXMLNamespace virQEMUDriverDomainXMLNamespace; extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig; extern virDomainABIStability virQEMUDriverDomainABIStability; extern virSaveCookieCallbacks virQEMUDriverDomainSaveCookie; +extern virDomainJobObjConfig virQEMUDriverDomainJobConfig; int qemuDomainUpdateDeviceList(virDomainObj *vm, int asyncJob); diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index a6ea7b2f58..0ecadddbc7 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -31,38 +31,6 @@ VIR_LOG_INIT("qemu.qemu_domainjob"); -static void * -qemuJobDataAllocPrivateData(void) -{ - return g_new0(qemuDomainJobDataPrivate, 1); -} - - -static void * -qemuJobDataCopyPrivateData(void *data) -{ - qemuDomainJobDataPrivate *ret = g_new0(qemuDomainJobDataPrivate, 1); - - memcpy(ret, data, sizeof(qemuDomainJobDataPrivate)); - - return ret; -} - - -static void -qemuJobDataFreePrivateData(void *data) -{ - g_free(data); -} - - -virDomainJobDataPrivateDataCallbacks qemuJobDataPrivateDataCallbacks = { - .allocPrivateData = qemuJobDataAllocPrivateData, - .copyPrivateData = qemuJobDataCopyPrivateData, - .freePrivateData = qemuJobDataFreePrivateData, -}; - - void qemuDomainJobSetStatsType(virDomainJobData *jobData, qemuDomainJobStatsType type) @@ -130,16 +98,15 @@ void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; virObjectEvent *event; virTypedParameterPtr params = NULL; int nparams = 0; int type; - if (!priv->job.completed) + if (!vm->job->completed) return; - if (qemuDomainJobDataToParams(priv->job.completed, &type, + if (qemuDomainJobDataToParams(vm->job->completed, &type, &params, &nparams) < 0) { VIR_WARN("Could not get stats for completed job; domain %s", vm->def->name); @@ -160,8 +127,7 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm, virDomainJobStatus status, unsigned long long allowedJobs) { - qemuDomainObjPrivate *priv = vm->privateData; - virDomainJobObj *job = &priv->job; + virDomainJobObj *job = vm->job; VIR_DEBUG("Restoring %s async job for domain %s", virDomainAsyncJobTypeToString(asyncJob), vm->def->name); @@ -177,8 +143,8 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm, qemuDomainObjSetAsyncJobMask(vm, allowedJobs); - job->current = virDomainJobDataInit(&qemuJobDataPrivateDataCallbacks); - qemuDomainJobSetStatsType(priv->job.current, statsType); + job->current = virDomainJobDataInit(&virQEMUDriverDomainJobConfig.jobDataPrivateCb); + qemuDomainJobSetStatsType(vm->job->current, statsType); job->current->operation = operation; job->current->status = status; job->current->started = started; @@ -603,25 +569,24 @@ void qemuDomainObjSetJobPhase(virDomainObj *obj, int phase) { - qemuDomainObjPrivate *priv = obj->privateData; unsigned long long me = virThreadSelfID(); - if (!priv->job.asyncJob) + if (!obj->job->asyncJob) return; VIR_DEBUG("Setting '%s' phase to '%s'", - virDomainAsyncJobTypeToString(priv->job.asyncJob), - qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); + virDomainAsyncJobTypeToString(obj->job->asyncJob), + qemuDomainAsyncJobPhaseToString(obj->job->asyncJob, phase)); - if (priv->job.asyncOwner != 0 && - priv->job.asyncOwner != me) { + if (obj->job->asyncOwner != 0 && + obj->job->asyncOwner != me) { VIR_WARN("'%s' async job is owned by thread %llu, API '%s'", - virDomainAsyncJobTypeToString(priv->job.asyncJob), - priv->job.asyncOwner, - NULLSTR(priv->job.asyncOwnerAPI)); + virDomainAsyncJobTypeToString(obj->job->asyncJob), + obj->job->asyncOwner, + NULLSTR(obj->job->asyncOwnerAPI)); } - priv->job.phase = phase; + obj->job->phase = phase; qemuDomainSaveStatus(obj); } @@ -634,26 +599,25 @@ void qemuDomainObjStartJobPhase(virDomainObj *obj, int phase) { - qemuDomainObjPrivate *priv = obj->privateData; unsigned long long me = virThreadSelfID(); - if (!priv->job.asyncJob) + if (!obj->job->asyncJob) return; VIR_DEBUG("Starting phase '%s' of '%s' job", - qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase), - virDomainAsyncJobTypeToString(priv->job.asyncJob)); + qemuDomainAsyncJobPhaseToString(obj->job->asyncJob, phase), + virDomainAsyncJobTypeToString(obj->job->asyncJob)); - if (priv->job.asyncOwner == 0) { - priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); - } else if (me != priv->job.asyncOwner) { + if (obj->job->asyncOwner == 0) { + obj->job->asyncOwnerAPI = g_strdup(virThreadJobGet()); + } else if (me != obj->job->asyncOwner) { VIR_WARN("'%s' async job is owned by thread %llu, API '%s'", - virDomainAsyncJobTypeToString(priv->job.asyncJob), - priv->job.asyncOwner, - NULLSTR(priv->job.asyncOwnerAPI)); + virDomainAsyncJobTypeToString(obj->job->asyncJob), + obj->job->asyncOwner, + NULLSTR(obj->job->asyncOwnerAPI)); } - priv->job.asyncOwner = me; + obj->job->asyncOwner = me; qemuDomainObjSetJobPhase(obj, phase); } @@ -662,39 +626,33 @@ void qemuDomainObjSetAsyncJobMask(virDomainObj *obj, unsigned long long allowedJobs) { - qemuDomainObjPrivate *priv = obj->privateData; - - if (!priv->job.asyncJob) + if (!obj->job->asyncJob) return; - priv->job.mask = allowedJobs | JOB_MASK(VIR_JOB_DESTROY); + obj->job->mask = allowedJobs | JOB_MASK(VIR_JOB_DESTROY); } void qemuDomainObjDiscardAsyncJob(virDomainObj *obj) { - qemuDomainObjPrivate *priv = obj->privateData; - - if (priv->job.active == VIR_JOB_ASYNC_NESTED) - virDomainObjResetJob(&priv->job); - virDomainObjResetAsyncJob(&priv->job); + if (obj->job->active == VIR_JOB_ASYNC_NESTED) + virDomainObjResetJob(obj->job); + virDomainObjResetAsyncJob(obj->job); qemuDomainSaveStatus(obj); } void qemuDomainObjReleaseAsyncJob(virDomainObj *obj) { - qemuDomainObjPrivate *priv = obj->privateData; - VIR_DEBUG("Releasing ownership of '%s' async job", - virDomainAsyncJobTypeToString(priv->job.asyncJob)); + virDomainAsyncJobTypeToString(obj->job->asyncJob)); - if (priv->job.asyncOwner != virThreadSelfID()) { + if (obj->job->asyncOwner != virThreadSelfID()) { VIR_WARN("'%s' async job is owned by thread %llu", - virDomainAsyncJobTypeToString(priv->job.asyncJob), - priv->job.asyncOwner); + virDomainAsyncJobTypeToString(obj->job->asyncJob), + obj->job->asyncOwner); } - priv->job.asyncOwner = 0; + obj->job->asyncOwner = 0; } /* @@ -708,9 +666,7 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj) int qemuDomainObjBeginJob(virDomainObj *obj, virDomainJob job) { - qemuDomainObjPrivate *priv = obj->privateData; - - if (virDomainObjBeginJobInternal(obj, &priv->job, job, + if (virDomainObjBeginJobInternal(obj, obj->job, job, VIR_AGENT_JOB_NONE, VIR_ASYNC_JOB_NONE, false) < 0) return -1; @@ -728,9 +684,7 @@ int qemuDomainObjBeginAgentJob(virDomainObj *obj, virDomainAgentJob agentJob) { - qemuDomainObjPrivate *priv = obj->privateData; - - return virDomainObjBeginJobInternal(obj, &priv->job, VIR_JOB_NONE, + return virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_NONE, agentJob, VIR_ASYNC_JOB_NONE, false); } @@ -740,16 +694,13 @@ int qemuDomainObjBeginAsyncJob(virDomainObj *obj, virDomainJobOperation operation, unsigned long apiFlags) { - qemuDomainObjPrivate *priv = obj->privateData; - - if (virDomainObjBeginJobInternal(obj, &priv->job, VIR_JOB_ASYNC, + if (virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC, VIR_AGENT_JOB_NONE, asyncJob, false) < 0) return -1; - priv = obj->privateData; - priv->job.current->operation = operation; - priv->job.apiFlags = apiFlags; + obj->job->current->operation = operation; + obj->job->apiFlags = apiFlags; return 0; } @@ -757,21 +708,19 @@ int qemuDomainObjBeginNestedJob(virDomainObj *obj, virDomainAsyncJob asyncJob) { - qemuDomainObjPrivate *priv = obj->privateData; - - if (asyncJob != priv->job.asyncJob) { + if (asyncJob != obj->job->asyncJob) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected async job %d type expected %d"), - asyncJob, priv->job.asyncJob); + asyncJob, obj->job->asyncJob); return -1; } - if (priv->job.asyncOwner != virThreadSelfID()) { + if (obj->job->asyncOwner != virThreadSelfID()) { VIR_WARN("This thread doesn't seem to be the async job owner: %llu", - priv->job.asyncOwner); + obj->job->asyncOwner); } - return virDomainObjBeginJobInternal(obj, &priv->job, + return virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC_NESTED, VIR_AGENT_JOB_NONE, VIR_ASYNC_JOB_NONE, @@ -794,9 +743,7 @@ int qemuDomainObjBeginJobNowait(virDomainObj *obj, virDomainJob job) { - qemuDomainObjPrivate *priv = obj->privateData; - - return virDomainObjBeginJobInternal(obj, &priv->job, job, + return virDomainObjBeginJobInternal(obj, obj->job, job, VIR_AGENT_JOB_NONE, VIR_ASYNC_JOB_NONE, true); } @@ -810,69 +757,63 @@ qemuDomainObjBeginJobNowait(virDomainObj *obj, void qemuDomainObjEndJob(virDomainObj *obj) { - qemuDomainObjPrivate *priv = obj->privateData; - virDomainJob job = priv->job.active; + virDomainJob job = obj->job->active; - priv->job.jobsQueued--; + obj->job->jobsQueued--; VIR_DEBUG("Stopping job: %s (async=%s vm=%p name=%s)", virDomainJobTypeToString(job), - virDomainAsyncJobTypeToString(priv->job.asyncJob), + virDomainAsyncJobTypeToString(obj->job->asyncJob), obj, obj->def->name); - virDomainObjResetJob(&priv->job); + virDomainObjResetJob(obj->job); if (virDomainTrackJob(job)) qemuDomainSaveStatus(obj); /* We indeed need to wake up ALL threads waiting because * grabbing a job requires checking more variables. */ - virCondBroadcast(&priv->job.cond); + virCondBroadcast(&obj->job->cond); } void qemuDomainObjEndAgentJob(virDomainObj *obj) { - qemuDomainObjPrivate *priv = obj->privateData; - virDomainAgentJob agentJob = priv->job.agentActive; + virDomainAgentJob agentJob = obj->job->agentActive; - priv->job.jobsQueued--; + obj->job->jobsQueued--; VIR_DEBUG("Stopping agent job: %s (async=%s vm=%p name=%s)", virDomainAgentJobTypeToString(agentJob), - virDomainAsyncJobTypeToString(priv->job.asyncJob), + virDomainAsyncJobTypeToString(obj->job->asyncJob), obj, obj->def->name); - virDomainObjResetAgentJob(&priv->job); + virDomainObjResetAgentJob(obj->job); /* We indeed need to wake up ALL threads waiting because * grabbing a job requires checking more variables. */ - virCondBroadcast(&priv->job.cond); + virCondBroadcast(&obj->job->cond); } void qemuDomainObjEndAsyncJob(virDomainObj *obj) { - qemuDomainObjPrivate *priv = obj->privateData; - - priv->job.jobsQueued--; + obj->job->jobsQueued--; VIR_DEBUG("Stopping async job: %s (vm=%p name=%s)", - virDomainAsyncJobTypeToString(priv->job.asyncJob), + virDomainAsyncJobTypeToString(obj->job->asyncJob), obj, obj->def->name); - virDomainObjResetAsyncJob(&priv->job); + virDomainObjResetAsyncJob(obj->job); qemuDomainSaveStatus(obj); - virCondBroadcast(&priv->job.asyncCond); + virCondBroadcast(&obj->job->asyncCond); } void qemuDomainObjAbortAsyncJob(virDomainObj *obj) { - qemuDomainObjPrivate *priv = obj->privateData; - VIR_DEBUG("Requesting abort of async job: %s (vm=%p name=%s)", - virDomainAsyncJobTypeToString(priv->job.asyncJob), + virDomainAsyncJobTypeToString(obj->job->asyncJob), obj, obj->def->name); - priv->job.abortJob = true; + obj->job->abortJob = true; virDomainObjBroadcast(obj); } @@ -880,35 +821,34 @@ int qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - virDomainJob job = priv->job.active; + virDomainJob job = vm->job->active; if (!virDomainTrackJob(job)) job = VIR_JOB_NONE; if (job == VIR_JOB_NONE && - priv->job.asyncJob == VIR_ASYNC_JOB_NONE) + vm->job->asyncJob == VIR_ASYNC_JOB_NONE) return 0; virBufferAsprintf(&attrBuf, " type='%s' async='%s'", virDomainJobTypeToString(job), - virDomainAsyncJobTypeToString(priv->job.asyncJob)); + virDomainAsyncJobTypeToString(vm->job->asyncJob)); - if (priv->job.phase) { + if (vm->job->phase) { virBufferAsprintf(&attrBuf, " phase='%s'", - qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, - priv->job.phase)); + qemuDomainAsyncJobPhaseToString(vm->job->asyncJob, + vm->job->phase)); } - if (priv->job.asyncJob != VIR_ASYNC_JOB_NONE) { - virBufferAsprintf(&attrBuf, " flags='0x%lx'", priv->job.apiFlags); - virBufferAsprintf(&attrBuf, " asyncStarted='%llu'", priv->job.asyncStarted); + if (vm->job->asyncJob != VIR_ASYNC_JOB_NONE) { + virBufferAsprintf(&attrBuf, " flags='0x%lx'", vm->job->apiFlags); + virBufferAsprintf(&attrBuf, " asyncStarted='%llu'", vm->job->asyncStarted); } - if (priv->job.cb && - priv->job.cb->formatJobPrivate(&childBuf, &priv->job, vm) < 0) + if (vm->job->cb && + vm->job->cb->formatJobPrivate(&childBuf, vm->job, vm) < 0) return -1; virXMLFormatElement(buf, "job", &attrBuf, &childBuf); @@ -921,8 +861,7 @@ int qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, xmlXPathContextPtr ctxt) { - qemuDomainObjPrivate *priv = vm->privateData; - virDomainJobObj *job = &priv->job; + virDomainJobObj *job = vm->job; VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *tmp = NULL; @@ -938,7 +877,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, return -1; } VIR_FREE(tmp); - priv->job.active = type; + vm->job->active = type; } if ((tmp = virXPathString("string(@async)", ctxt))) { @@ -950,11 +889,11 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, return -1; } VIR_FREE(tmp); - priv->job.asyncJob = async; + vm->job->asyncJob = async; if ((tmp = virXPathString("string(@phase)", ctxt))) { - priv->job.phase = qemuDomainAsyncJobPhaseFromString(async, tmp); - if (priv->job.phase < 0) { + vm->job->phase = qemuDomainAsyncJobPhaseFromString(async, tmp); + if (vm->job->phase < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown job phase %s"), tmp); return -1; @@ -963,20 +902,20 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, } if (virXPathULongLong("string(@asyncStarted)", ctxt, - &priv->job.asyncStarted) == -2) { + &vm->job->asyncStarted) == -2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid async job start")); return -1; } } - if (virXPathULongHex("string(@flags)", ctxt, &priv->job.apiFlags) == -2) { + if (virXPathULongHex("string(@flags)", ctxt, &vm->job->apiFlags) == -2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags")); return -1; } - if (priv->job.cb && - priv->job.cb->parseJobPrivate(ctxt, job, vm) < 0) + if (vm->job->cb && + vm->job->cb->parseJobPrivate(ctxt, job, vm) < 0) return -1; return 0; diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 23eadc26a7..201d7857a8 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -58,8 +58,6 @@ struct _qemuDomainJobDataPrivate { qemuDomainMirrorStats mirrorStats; }; -extern virDomainJobDataPrivateDataCallbacks qemuJobDataPrivateDataCallbacks; - void qemuDomainJobSetStatsType(virDomainJobData *jobData, qemuDomainJobStatsType type); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c7cca64001..383c88f784 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1671,7 +1671,6 @@ static int qemuDomainSuspend(virDomainPtr dom) virQEMUDriver *driver = dom->conn->privateData; virDomainObj *vm; int ret = -1; - qemuDomainObjPrivate *priv; virDomainPausedReason reason; int state; @@ -1681,17 +1680,15 @@ static int qemuDomainSuspend(virDomainPtr dom) if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - priv = vm->privateData; - if (qemuDomainObjBeginJob(vm, VIR_JOB_SUSPEND) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) reason = VIR_DOMAIN_PAUSED_MIGRATION; - else if (priv->job.asyncJob == VIR_ASYNC_JOB_SNAPSHOT) + else if (vm->job->asyncJob == VIR_ASYNC_JOB_SNAPSHOT) reason = VIR_DOMAIN_PAUSED_SNAPSHOT; else reason = VIR_DOMAIN_PAUSED_USER; @@ -2102,7 +2099,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, qemuDomainSetFakeReboot(vm, false); - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, @@ -2589,12 +2586,12 @@ qemuDomainGetControlInfo(virDomainPtr dom, if (priv->monError) { info->state = VIR_DOMAIN_CONTROL_ERROR; info->details = VIR_DOMAIN_CONTROL_ERROR_REASON_MONITOR; - } else if (priv->job.active) { + } else if (vm->job->active) { if (virTimeMillisNow(&info->stateTime) < 0) goto cleanup; - if (priv->job.current) { + if (vm->job->current) { info->state = VIR_DOMAIN_CONTROL_JOB; - info->stateTime -= priv->job.current->started; + info->stateTime -= vm->job->current->started; } else { if (priv->monStart > 0) { info->state = VIR_DOMAIN_CONTROL_OCCUPIED; @@ -2653,7 +2650,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, goto endjob; } - qemuDomainJobSetStatsType(priv->job.current, + qemuDomainJobSetStatsType(vm->job->current, QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP); /* Pause */ @@ -3016,28 +3013,27 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) static int qemuDumpWaitForCompletion(virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; - qemuDomainJobDataPrivate *privJobCurrent = priv->job.current->privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; + qemuDomainJobDataPrivate *privJobCurrent = vm->job->current->privateData; VIR_DEBUG("Waiting for dump completion"); - while (!jobPriv->dumpCompleted && !priv->job.abortJob) { + while (!jobPriv->dumpCompleted && !vm->job->abortJob) { if (qemuDomainObjWait(vm) < 0) return -1; } if (privJobCurrent->stats.dump.status == QEMU_MONITOR_DUMP_STATUS_FAILED) { - if (priv->job.error) + if (vm->job->error) virReportError(VIR_ERR_OPERATION_FAILED, _("memory-only dump failed: %s"), - priv->job.error); + vm->job->error); else virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("memory-only dump failed for unknown reason")); return -1; } - qemuDomainJobDataUpdateTime(priv->job.current); + qemuDomainJobDataUpdateTime(vm->job->current); return 0; } @@ -3060,10 +3056,10 @@ qemuDumpToFd(virQEMUDriver *driver, return -1; if (detach) { - qemuDomainJobSetStatsType(priv->job.current, + qemuDomainJobSetStatsType(vm->job->current, QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP); } else { - g_clear_pointer(&priv->job.current, virDomainJobDataFree); + g_clear_pointer(&vm->job->current, virDomainJobDataFree); } if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) @@ -3222,7 +3218,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, goto endjob; priv = vm->privateData; - qemuDomainJobSetStatsType(priv->job.current, + qemuDomainJobSetStatsType(vm->job->current, QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP); /* Migrate will always stop the VM, so the resume condition is @@ -4058,7 +4054,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, auditReason = "failed"; } - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) { + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) { stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; qemuMigrationDstErrorSave(driver, vm->def->name, qemuMonitorLastError(priv->mon)); @@ -6507,7 +6503,6 @@ qemuDomainObjStart(virConnectPtr conn, bool force_boot = (flags & VIR_DOMAIN_START_FORCE_BOOT) != 0; bool reset_nvram = (flags & VIR_DOMAIN_START_RESET_NVRAM) != 0; unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; - qemuDomainObjPrivate *priv = vm->privateData; start_flags |= start_paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; start_flags |= autodestroy ? VIR_QEMU_PROCESS_START_AUTODESTROY : 0; @@ -6529,8 +6524,8 @@ qemuDomainObjStart(virConnectPtr conn, } vm->hasManagedSave = false; } else { - virDomainJobOperation op = priv->job.current->operation; - priv->job.current->operation = VIR_DOMAIN_JOB_OPERATION_RESTORE; + virDomainJobOperation op = vm->job->current->operation; + vm->job->current->operation = VIR_DOMAIN_JOB_OPERATION_RESTORE; ret = qemuDomainObjRestore(conn, driver, vm, managed_save, start_paused, bypass_cache, @@ -6549,7 +6544,7 @@ qemuDomainObjStart(virConnectPtr conn, return ret; } else { VIR_WARN("Ignoring incomplete managed state %s", managed_save); - priv->job.current->operation = op; + vm->job->current->operation = op; vm->hasManagedSave = false; } } @@ -12665,20 +12660,19 @@ qemuDomainGetJobStatsInternal(virDomainObj *vm, bool completed, virDomainJobData **jobData) { - qemuDomainObjPrivate *priv = vm->privateData; qemuDomainJobDataPrivate *privStats = NULL; int ret = -1; *jobData = NULL; if (completed) { - if (priv->job.completed && !priv->job.current) - *jobData = virDomainJobDataCopy(priv->job.completed); + if (vm->job->completed && !vm->job->current) + *jobData = virDomainJobDataCopy(vm->job->completed); return 0; } - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) { + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("migration statistics are available only on " "the source host")); @@ -12691,11 +12685,11 @@ qemuDomainGetJobStatsInternal(virDomainObj *vm, if (virDomainObjCheckActive(vm) < 0) goto cleanup; - if (!priv->job.current) { + if (!vm->job->current) { ret = 0; goto cleanup; } - *jobData = virDomainJobDataCopy(priv->job.current); + *jobData = virDomainJobDataCopy(vm->job->current); privStats = (*jobData)->privateData; @@ -12769,7 +12763,6 @@ qemuDomainGetJobStats(virDomainPtr dom, unsigned int flags) { virDomainObj *vm; - qemuDomainObjPrivate *priv; g_autoptr(virDomainJobData) jobData = NULL; bool completed = !!(flags & VIR_DOMAIN_JOB_STATS_COMPLETED); int ret = -1; @@ -12783,7 +12776,6 @@ qemuDomainGetJobStats(virDomainPtr dom, if (virDomainGetJobStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - priv = vm->privateData; if (qemuDomainGetJobStatsInternal(vm, completed, &jobData) < 0) goto cleanup; @@ -12799,7 +12791,7 @@ qemuDomainGetJobStats(virDomainPtr dom, ret = qemuDomainJobDataToParams(jobData, type, params, nparams); if (completed && ret == 0 && !(flags & VIR_DOMAIN_JOB_STATS_KEEP_COMPLETED)) - g_clear_pointer(&priv->job.completed, virDomainJobDataFree); + g_clear_pointer(&vm->job->completed, virDomainJobDataFree); cleanup: virDomainObjEndAPI(&vm); @@ -12875,14 +12867,14 @@ qemuDomainAbortJobFlags(virDomainPtr dom, priv = vm->privateData; if (flags & VIR_DOMAIN_ABORT_JOB_POSTCOPY && - (priv->job.asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT || + (vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT || !virDomainObjIsPostcopy(vm, VIR_DOMAIN_JOB_OPERATION_MIGRATION_OUT))) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("current job is not outgoing migration in post-copy mode")); goto endjob; } - switch (priv->job.asyncJob) { + switch (vm->job->asyncJob) { case VIR_ASYNC_JOB_NONE: virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("no job is active on the domain")); @@ -12912,7 +12904,7 @@ qemuDomainAbortJobFlags(virDomainPtr dom, break; case VIR_ASYNC_JOB_DUMP: - if (priv->job.apiFlags & VIR_DUMP_MEMORY_ONLY) { + if (vm->job->apiFlags & VIR_DUMP_MEMORY_ONLY) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot abort memory-only dump")); goto endjob; @@ -12932,7 +12924,7 @@ qemuDomainAbortJobFlags(virDomainPtr dom, case VIR_ASYNC_JOB_LAST: default: - virReportEnumRangeError(virDomainAsyncJob, priv->job.asyncJob); + virReportEnumRangeError(virDomainAsyncJob, vm->job->asyncJob); break; } @@ -13341,14 +13333,14 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, priv = vm->privateData; - if (priv->job.asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) { + if (vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("post-copy can only be started while " "outgoing migration is in progress")); goto endjob; } - if (!(priv->job.apiFlags & VIR_MIGRATE_POSTCOPY)) { + if (!(vm->job->apiFlags & VIR_MIGRATE_POSTCOPY)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("switching to post-copy requires migration to be " "started with VIR_MIGRATE_POSTCOPY flag")); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b3b25d78b4..2572f47385 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -86,10 +86,8 @@ VIR_ENUM_IMPL(qemuMigrationJobPhase, static bool ATTRIBUTE_NONNULL(1) qemuMigrationJobIsAllowed(virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; - - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN || - priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) { + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN || + vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) { virReportError(VIR_ERR_OPERATION_INVALID, _("another migration job is already running for domain '%s'"), vm->def->name); @@ -105,7 +103,6 @@ qemuMigrationJobStart(virDomainObj *vm, virDomainAsyncJob job, unsigned long apiFlags) { - qemuDomainObjPrivate *priv = vm->privateData; virDomainJobOperation op; unsigned long long mask; @@ -126,7 +123,7 @@ qemuMigrationJobStart(virDomainObj *vm, if (qemuDomainObjBeginAsyncJob(vm, job, op, apiFlags) < 0) return -1; - qemuDomainJobSetStatsType(priv->job.current, + qemuDomainJobSetStatsType(vm->job->current, QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION); qemuDomainObjSetAsyncJobMask(vm, mask); @@ -138,13 +135,11 @@ static int qemuMigrationCheckPhase(virDomainObj *vm, qemuMigrationJobPhase phase) { - qemuDomainObjPrivate *priv = vm->privateData; - if (phase < QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && - phase < priv->job.phase) { + phase < vm->job->phase) { virReportError(VIR_ERR_INTERNAL_ERROR, _("migration protocol going backwards %s => %s"), - qemuMigrationJobPhaseTypeToString(priv->job.phase), + qemuMigrationJobPhaseTypeToString(vm->job->phase), qemuMigrationJobPhaseTypeToString(phase)); return -1; } @@ -190,9 +185,7 @@ static bool ATTRIBUTE_NONNULL(1) qemuMigrationJobIsActive(virDomainObj *vm, virDomainAsyncJob job) { - qemuDomainObjPrivate *priv = vm->privateData; - - if (priv->job.asyncJob != job) { + if (vm->job->asyncJob != job) { const char *msg; if (job == VIR_ASYNC_JOB_MIGRATION_IN) @@ -956,7 +949,7 @@ qemuMigrationSrcCancelRemoveTempBitmaps(virDomainObj *vm, virDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; GSList *next; for (next = jobPriv->migTempBitmaps; next; next = next->next) { @@ -1236,10 +1229,10 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, if (rv < 0) return -1; - if (priv->job.abortJob) { - priv->job.current->status = VIR_DOMAIN_JOB_STATUS_CANCELED; + if (vm->job->abortJob) { + vm->job->current->status = VIR_DOMAIN_JOB_STATUS_CANCELED; virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), - virDomainAsyncJobTypeToString(priv->job.asyncJob), + virDomainAsyncJobTypeToString(vm->job->asyncJob), _("canceled by client")); return -1; } @@ -1255,7 +1248,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, } qemuMigrationSrcFetchMirrorStats(vm, VIR_ASYNC_JOB_MIGRATION_OUT, - priv->job.current); + vm->job->current); return 0; } @@ -1718,14 +1711,13 @@ qemuMigrationDstPostcopyFailed(virDomainObj *vm) static void qemuMigrationSrcWaitForSpice(virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; if (!jobPriv->spiceMigration) return; VIR_DEBUG("Waiting for SPICE to finish migration"); - while (!jobPriv->spiceMigrated && !priv->job.abortJob) { + while (!jobPriv->spiceMigrated && !vm->job->abortJob) { if (qemuDomainObjWait(vm) < 0) return; } @@ -1810,9 +1802,7 @@ qemuMigrationAnyFetchStats(virDomainObj *vm, static const char * qemuMigrationJobName(virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; - - switch (priv->job.asyncJob) { + switch (vm->job->asyncJob) { case VIR_ASYNC_JOB_MIGRATION_OUT: return _("migration out"); case VIR_ASYNC_JOB_SAVE: @@ -1839,8 +1829,7 @@ static int qemuMigrationJobCheckStatus(virDomainObj *vm, virDomainAsyncJob asyncJob) { - qemuDomainObjPrivate *priv = vm->privateData; - virDomainJobData *jobData = priv->job.current; + virDomainJobData *jobData = vm->job->current; qemuDomainJobDataPrivate *privJob = jobData->privateData; g_autofree char *error = NULL; @@ -1916,8 +1905,7 @@ qemuMigrationAnyCompleted(virDomainObj *vm, virConnectPtr dconn, unsigned int flags) { - qemuDomainObjPrivate *priv = vm->privateData; - virDomainJobData *jobData = priv->job.current; + virDomainJobData *jobData = vm->job->current; int pauseReason; if (qemuMigrationJobCheckStatus(vm, asyncJob) < 0) @@ -2009,7 +1997,7 @@ qemuMigrationSrcWaitForCompletion(virDomainObj *vm, unsigned int flags) { qemuDomainObjPrivate *priv = vm->privateData; - virDomainJobData *jobData = priv->job.current; + virDomainJobData *jobData = vm->job->current; int rv; jobData->status = VIR_DOMAIN_JOB_STATUS_MIGRATING; @@ -2029,9 +2017,9 @@ qemuMigrationSrcWaitForCompletion(virDomainObj *vm, qemuDomainJobDataUpdateTime(jobData); qemuDomainJobDataUpdateDowntime(jobData); - g_clear_pointer(&priv->job.completed, virDomainJobDataFree); - priv->job.completed = virDomainJobDataCopy(jobData); - priv->job.completed->status = VIR_DOMAIN_JOB_STATUS_COMPLETED; + g_clear_pointer(&vm->job->completed, virDomainJobDataFree); + vm->job->completed = virDomainJobDataCopy(jobData); + vm->job->completed->status = VIR_DOMAIN_JOB_STATUS_COMPLETED; if (asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT && jobData->status == VIR_DOMAIN_JOB_STATUS_HYPERVISOR_COMPLETED) @@ -2143,7 +2131,7 @@ qemuMigrationSrcGraphicsRelocate(virDomainObj *vm, return 0; if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT) == 0) { - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; rc = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, port, tlsPort, tlsSubject); @@ -2276,16 +2264,15 @@ static void qemuMigrationAnyConnectionClosed(virDomainObj *vm, virConnectPtr conn) { - qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; bool postcopy = false; int phase; VIR_DEBUG("vm=%s, conn=%p, asyncJob=%s, phase=%s", vm->def->name, conn, - virDomainAsyncJobTypeToString(priv->job.asyncJob), - qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, - priv->job.phase)); + virDomainAsyncJobTypeToString(vm->job->asyncJob), + qemuDomainAsyncJobPhaseToString(vm->job->asyncJob, + vm->job->phase)); if (!qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_IN) && !qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_OUT)) @@ -2294,7 +2281,7 @@ qemuMigrationAnyConnectionClosed(virDomainObj *vm, VIR_WARN("The connection which controls migration of domain %s was closed", vm->def->name); - switch ((qemuMigrationJobPhase) priv->job.phase) { + switch ((qemuMigrationJobPhase) vm->job->phase) { case QEMU_MIGRATION_PHASE_BEGIN3: VIR_DEBUG("Aborting outgoing migration after Begin phase"); break; @@ -2346,14 +2333,14 @@ qemuMigrationAnyConnectionClosed(virDomainObj *vm, ignore_value(qemuMigrationJobStartPhase(vm, phase)); if (postcopy) { - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) qemuMigrationSrcPostcopyFailed(vm); else qemuMigrationDstPostcopyFailed(vm); qemuMigrationJobContinue(vm, qemuProcessCleanupMigrationJob); } else { - qemuMigrationParamsReset(vm, priv->job.asyncJob, - jobPriv->migParams, priv->job.apiFlags); + qemuMigrationParamsReset(vm, vm->job->asyncJob, + jobPriv->migParams, vm->job->apiFlags); qemuMigrationJobFinish(vm); } } @@ -2377,12 +2364,11 @@ qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigrationCookie *mig, { GSList *disks = NULL; - qemuDomainObjPrivate *priv = vm->privateData; size_t i; g_autoptr(GHashTable) blockNamedNodeData = NULL; - if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, priv->job.asyncJob))) + if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, vm->job->asyncJob))) return -1; for (i = 0; i < vm->def->ndisks; i++) { @@ -2452,7 +2438,7 @@ qemuMigrationAnyRefreshStatus(virDomainObj *vm, g_autoptr(virDomainJobData) jobData = NULL; qemuDomainJobDataPrivate *priv; - jobData = virDomainJobDataInit(&qemuJobDataPrivateDataCallbacks); + jobData = virDomainJobDataInit(&virQEMUDriverDomainJobConfig.jobDataPrivateCb); priv = jobData->privateData; if (qemuMigrationAnyFetchStats(vm, asyncJob, jobData, NULL) < 0) @@ -2549,11 +2535,11 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, * Otherwise we will start the async job later in the perform phase losing * change protection. */ - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT && + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT && qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_BEGIN3) < 0) return NULL; - if (!qemuMigrationSrcIsAllowed(driver, vm, true, priv->job.asyncJob, flags)) + if (!qemuMigrationSrcIsAllowed(driver, vm, true, vm->job->asyncJob, flags)) return NULL; if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && @@ -2656,8 +2642,6 @@ qemuMigrationAnyCanResume(virDomainObj *vm, unsigned long flags, qemuMigrationJobPhase expectedPhase) { - qemuDomainObjPrivate *priv = vm->privateData; - VIR_DEBUG("vm=%p, job=%s, flags=0x%lx, expectedPhase=%s", vm, virDomainAsyncJobTypeToString(job), flags, qemuDomainAsyncJobPhaseToString(VIR_ASYNC_JOB_MIGRATION_OUT, @@ -2684,22 +2668,22 @@ qemuMigrationAnyCanResume(virDomainObj *vm, if (!qemuMigrationJobIsActive(vm, job)) return false; - if (priv->job.asyncOwner != 0 && - priv->job.asyncOwner != virThreadSelfID()) { + if (vm->job->asyncOwner != 0 && + vm->job->asyncOwner != virThreadSelfID()) { virReportError(VIR_ERR_OPERATION_INVALID, _("migration of domain %s is being actively monitored by another thread"), vm->def->name); return false; } - if (!virDomainObjIsPostcopy(vm, priv->job.current->operation)) { + if (!virDomainObjIsPostcopy(vm, vm->job->current->operation)) { virReportError(VIR_ERR_OPERATION_INVALID, _("migration of domain %s is not in post-copy phase"), vm->def->name); return false; } - if (priv->job.phase < QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && + if (vm->job->phase < QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && !virDomainObjIsFailedPostcopy(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, _("post-copy migration of domain %s has not failed"), @@ -2707,7 +2691,7 @@ qemuMigrationAnyCanResume(virDomainObj *vm, return false; } - if (priv->job.phase > expectedPhase) { + if (vm->job->phase > expectedPhase) { virReportError(VIR_ERR_OPERATION_INVALID, _("resuming failed post-copy migration of domain %s already in progress"), vm->def->name); @@ -2881,8 +2865,8 @@ qemuMigrationDstPrepareCleanup(virQEMUDriver *driver, VIR_DEBUG("driver=%p, vm=%s, job=%s, asyncJob=%s", driver, vm->def->name, - virDomainJobTypeToString(priv->job.active), - virDomainAsyncJobTypeToString(priv->job.asyncJob)); + virDomainJobTypeToString(vm->job->active), + virDomainAsyncJobTypeToString(vm->job->asyncJob)); virPortAllocatorRelease(priv->migrationPort); priv->migrationPort = 0; @@ -3061,7 +3045,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, unsigned long flags) { qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; qemuProcessIncomingDef *incoming = NULL; g_autofree char *tlsAlias = NULL; virObjectEvent *event = NULL; @@ -3219,7 +3203,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, error: virErrorPreserveLast(&origErr); qemuMigrationParamsReset(vm, VIR_ASYNC_JOB_MIGRATION_IN, - jobPriv->migParams, priv->job.apiFlags); + jobPriv->migParams, vm->job->apiFlags); if (stopProcess) { unsigned int stopFlags = VIR_QEMU_PROCESS_STOP_MIGRATED; @@ -3333,7 +3317,8 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver, QEMU_MIGRATION_COOKIE_CPU_HOTPLUG | QEMU_MIGRATION_COOKIE_CPU | QEMU_MIGRATION_COOKIE_CAPS | - QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS))) + QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS, + NULL))) goto cleanup; if (!(vm = virDomainObjListAdd(driver->domains, def, @@ -3477,7 +3462,7 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver, if (!(mig = qemuMigrationCookieParse(driver, def, origname, NULL, cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_CAPS))) + QEMU_MIGRATION_COOKIE_CAPS, vm))) goto cleanup; priv->origname = g_strdup(origname); @@ -3858,13 +3843,13 @@ qemuMigrationSrcComplete(virQEMUDriver *driver, virDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv = vm->privateData; - virDomainJobData *jobData = priv->job.completed; + virDomainJobData *jobData = vm->job->completed; virObjectEvent *event; int reason; if (!jobData) { - priv->job.completed = virDomainJobDataCopy(priv->job.current); - jobData = priv->job.completed; + vm->job->completed = virDomainJobDataCopy(vm->job->current); + jobData = vm->job->completed; jobData->status = VIR_DOMAIN_JOB_STATUS_COMPLETED; } @@ -3909,7 +3894,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, { g_autoptr(qemuMigrationCookie) mig = NULL; qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; virDomainJobData *jobData = NULL; qemuMigrationJobPhase phase; @@ -3927,7 +3912,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, * job will stay active even though migration API finishes with an * error. */ - phase = priv->job.phase; + phase = vm->job->phase; } else if (retcode == 0) { phase = QEMU_MIGRATION_PHASE_CONFIRM3; } else { @@ -3939,13 +3924,13 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, if (!(mig = qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_STATS))) + QEMU_MIGRATION_COOKIE_STATS, vm))) return -1; if (retcode == 0) - jobData = priv->job.completed; + jobData = vm->job->completed; else - g_clear_pointer(&priv->job.completed, virDomainJobDataFree); + g_clear_pointer(&vm->job->completed, virDomainJobDataFree); /* Update times with the values sent by the destination daemon */ if (mig->jobData && jobData) { @@ -3985,7 +3970,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, qemuMigrationSrcRestoreDomainState(driver, vm); qemuMigrationParamsReset(vm, VIR_ASYNC_JOB_MIGRATION_OUT, - jobPriv->migParams, priv->job.apiFlags); + jobPriv->migParams, vm->job->apiFlags); qemuDomainSetMaxMemLock(vm, 0, &priv->preMigrationMemlock); } @@ -4005,7 +3990,6 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, { qemuMigrationJobPhase phase; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - qemuDomainObjPrivate *priv = vm->privateData; int ret = -1; VIR_DEBUG("vm=%p, flags=0x%x, cancelled=%d", vm, flags, cancelled); @@ -4024,7 +4008,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, * error. */ if (virDomainObjIsFailedPostcopy(vm)) - phase = priv->job.phase; + phase = vm->job->phase; else if (cancelled) phase = QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED; else @@ -4416,7 +4400,7 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(virDomainObj *vm, { g_autoslist(qemuDomainJobPrivateMigrateTempBitmap) tmpbitmaps = NULL; qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; g_autoptr(virJSONValue) actions = virJSONValueNewArray(); g_autoptr(GHashTable) blockNamedNodeData = NULL; GSList *nextdisk; @@ -4703,7 +4687,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver, cookieFlags | QEMU_MIGRATION_COOKIE_GRAPHICS | QEMU_MIGRATION_COOKIE_CAPS | - QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS); + QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS, + NULL); if (!mig) goto error; @@ -4814,13 +4799,13 @@ qemuMigrationSrcRun(virQEMUDriver *driver, if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT) < 0) goto error; - if (priv->job.abortJob) { + if (vm->job->abortJob) { /* explicitly do this *after* we entered the monitor, * as this is a critical section so we are guaranteed - * priv->job.abortJob will not change */ - priv->job.current->status = VIR_DOMAIN_JOB_STATUS_CANCELED; + * vm->job->abortJob will not change */ + vm->job->current->status = VIR_DOMAIN_JOB_STATUS_CANCELED; virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), - virDomainAsyncJobTypeToString(priv->job.asyncJob), + virDomainAsyncJobTypeToString(vm->job->asyncJob), _("canceled by client")); goto exit_monitor; } @@ -4884,7 +4869,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, * resume it now once we finished all block jobs and wait for the real * end of the migration. */ - if (priv->job.current->status == VIR_DOMAIN_JOB_STATUS_PAUSED) { + if (vm->job->current->status == VIR_DOMAIN_JOB_STATUS_PAUSED) { if (qemuMigrationSrcContinue(vm, QEMU_MONITOR_MIGRATION_STATUS_PRE_SWITCHOVER, VIR_ASYNC_JOB_MIGRATION_OUT) < 0) @@ -4913,11 +4898,11 @@ qemuMigrationSrcRun(virQEMUDriver *driver, goto error; } - if (priv->job.completed) { - priv->job.completed->stopped = priv->job.current->stopped; - qemuDomainJobDataUpdateTime(priv->job.completed); - qemuDomainJobDataUpdateDowntime(priv->job.completed); - ignore_value(virTimeMillisNow(&priv->job.completed->sent)); + if (vm->job->completed) { + vm->job->completed->stopped = vm->job->current->stopped; + qemuDomainJobDataUpdateTime(vm->job->completed); + qemuDomainJobDataUpdateDowntime(vm->job->completed); + ignore_value(virTimeMillisNow(&vm->job->completed->sent)); } cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK | @@ -4952,7 +4937,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, } if (cancel && - priv->job.current->status != VIR_DOMAIN_JOB_STATUS_HYPERVISOR_COMPLETED && + vm->job->current->status != VIR_DOMAIN_JOB_STATUS_HYPERVISOR_COMPLETED && qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT) == 0) { qemuMonitorMigrateCancel(priv->mon); qemuDomainObjExitMonitor(vm); @@ -4966,8 +4951,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver, qemuMigrationSrcCancelRemoveTempBitmaps(vm, VIR_ASYNC_JOB_MIGRATION_OUT); - if (priv->job.current->status != VIR_DOMAIN_JOB_STATUS_CANCELED) - priv->job.current->status = VIR_DOMAIN_JOB_STATUS_FAILED; + if (vm->job->current->status != VIR_DOMAIN_JOB_STATUS_CANCELED) + vm->job->current->status = VIR_DOMAIN_JOB_STATUS_FAILED; } if (iothread) @@ -5002,7 +4987,7 @@ qemuMigrationSrcResume(virDomainObj *vm, mig = qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_CAPS); + QEMU_MIGRATION_COOKIE_CAPS, vm); if (!mig) return -1; @@ -5913,7 +5898,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, virErrorPtr orig_err = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { if (!qemuMigrationAnyCanResume(vm, VIR_ASYNC_JOB_MIGRATION_OUT, flags, @@ -5991,7 +5976,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, */ if (!v3proto && ret < 0) qemuMigrationParamsReset(vm, VIR_ASYNC_JOB_MIGRATION_OUT, - jobPriv->migParams, priv->job.apiFlags); + jobPriv->migParams, vm->job->apiFlags); qemuMigrationSrcRestoreDomainState(driver, vm); @@ -6080,7 +6065,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, const char *nbdURI) { qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; int ret = -1; if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { @@ -6120,7 +6105,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, if (ret < 0 && !virDomainObjIsFailedPostcopy(vm)) { qemuMigrationSrcRestoreDomainState(driver, vm); qemuMigrationParamsReset(vm, VIR_ASYNC_JOB_MIGRATION_OUT, - jobPriv->migParams, priv->job.apiFlags); + jobPriv->migParams, vm->job->apiFlags); qemuDomainSetMaxMemLock(vm, 0, &priv->preMigrationMemlock); qemuMigrationJobFinish(vm); } else { @@ -6399,7 +6384,7 @@ qemuMigrationDstFinishOffline(virQEMUDriver *driver, g_autoptr(qemuMigrationCookie) mig = NULL; if (!(mig = qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, - cookiein, cookieinlen, cookie_flags))) + cookiein, cookieinlen, cookie_flags, NULL))) return NULL; if (qemuMigrationDstPersist(driver, vm, mig, false) < 0) @@ -6432,7 +6417,6 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, bool *doKill, bool *inPostCopy) { - qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virDomainJobData) jobData = NULL; if (qemuMigrationDstVPAssociatePortProfiles(vm->def) < 0) @@ -6492,7 +6476,7 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, return -1; } - if (priv->job.current->status == VIR_DOMAIN_JOB_STATUS_POSTCOPY) + if (vm->job->current->status == VIR_DOMAIN_JOB_STATUS_POSTCOPY) *inPostCopy = true; if (!(flags & VIR_MIGRATE_PAUSED)) { @@ -6542,9 +6526,9 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, } if (jobData) { - priv->job.completed = g_steal_pointer(&jobData); - priv->job.completed->status = VIR_DOMAIN_JOB_STATUS_COMPLETED; - qemuDomainJobSetStatsType(priv->job.completed, + vm->job->completed = g_steal_pointer(&jobData); + vm->job->completed->status = VIR_DOMAIN_JOB_STATUS_COMPLETED; + qemuDomainJobSetStatsType(vm->job->completed, QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION); } @@ -6586,17 +6570,17 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, virDomainPtr dom = NULL; g_autoptr(qemuMigrationCookie) mig = NULL; qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; virObjectEvent *event; bool inPostCopy = false; - bool doKill = priv->job.phase != QEMU_MIGRATION_PHASE_FINISH_RESUME; + bool doKill = vm->job->phase != QEMU_MIGRATION_PHASE_FINISH_RESUME; int rc; VIR_DEBUG("vm=%p, flags=0x%lx, retcode=%d", vm, flags, retcode); if (!(mig = qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, - cookiein, cookieinlen, cookie_flags))) + cookiein, cookieinlen, cookie_flags, NULL))) goto error; if (retcode != 0) { @@ -6633,7 +6617,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, VIR_WARN("Unable to encode migration cookie"); qemuMigrationDstComplete(driver, vm, inPostCopy, - VIR_ASYNC_JOB_MIGRATION_IN, &priv->job); + VIR_ASYNC_JOB_MIGRATION_IN, vm->job); return dom; @@ -6663,7 +6647,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, *finishJob = false; } else { qemuMigrationParamsReset(vm, VIR_ASYNC_JOB_MIGRATION_IN, - jobPriv->migParams, priv->job.apiFlags); + jobPriv->migParams, vm->job->apiFlags); } if (!virDomainObjIsActive(vm)) @@ -6725,7 +6709,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, } else { qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup); } - g_clear_pointer(&priv->job.completed, virDomainJobDataFree); + g_clear_pointer(&vm->job->completed, virDomainJobDataFree); cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK | QEMU_MIGRATION_COOKIE_STATS | @@ -6778,7 +6762,6 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver, virDomainAsyncJob job, qemuMonitorMigrationStatus status) { - qemuDomainObjPrivate *priv = vm->privateData; qemuMigrationJobPhase phase; if (!qemuMigrationJobIsActive(vm, job) || @@ -6798,7 +6781,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver, return; if (job == VIR_ASYNC_JOB_MIGRATION_IN) - qemuMigrationDstComplete(driver, vm, true, job, &priv->job); + qemuMigrationDstComplete(driver, vm, true, job, vm->job); else qemuMigrationSrcComplete(driver, vm, job); diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index bd939a12be..a4e018e204 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -495,7 +495,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, mig->nbd->disks = g_new0(struct qemuMigrationCookieNBDDisk, vm->def->ndisks); mig->nbd->ndisks = 0; - if (qemuDomainObjEnterMonitorAsync(vm, priv->job.asyncJob) < 0) + if (qemuDomainObjEnterMonitorAsync(vm, vm->job->asyncJob) < 0) return -1; rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats); @@ -525,13 +525,11 @@ static int qemuMigrationCookieAddStatistics(qemuMigrationCookie *mig, virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; - - if (!priv->job.completed) + if (!vm->job->completed) return 0; g_clear_pointer(&mig->jobData, virDomainJobDataFree); - mig->jobData = virDomainJobDataCopy(priv->job.completed); + mig->jobData = virDomainJobDataCopy(vm->job->completed); mig->flags |= QEMU_MIGRATION_COOKIE_STATS; @@ -1042,7 +1040,7 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) if (!(ctxt->node = virXPathNode("./statistics", ctxt))) return NULL; - jobData = virDomainJobDataInit(&qemuJobDataPrivateDataCallbacks); + jobData = virDomainJobDataInit(&virQEMUDriverDomainJobConfig.jobDataPrivateCb); priv = jobData->privateData; stats = &priv->stats.mig; jobData->status = VIR_DOMAIN_JOB_STATUS_COMPLETED; @@ -1497,7 +1495,8 @@ qemuMigrationCookieParse(virQEMUDriver *driver, qemuDomainObjPrivate *priv, const char *cookiein, int cookieinlen, - unsigned int flags) + unsigned int flags, + virDomainObj *vm) { g_autoptr(qemuMigrationCookie) mig = NULL; @@ -1547,8 +1546,8 @@ qemuMigrationCookieParse(virQEMUDriver *driver, } } - if (flags & QEMU_MIGRATION_COOKIE_STATS && mig->jobData && priv->job.current) - mig->jobData->operation = priv->job.current->operation; + if (vm && flags & QEMU_MIGRATION_COOKIE_STATS && mig->jobData && vm->job->current) + mig->jobData->operation = vm->job->current->operation; return g_steal_pointer(&mig); } diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_cookie.h index 2f0cdcf7b6..07776aaa8b 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -194,7 +194,8 @@ qemuMigrationCookieParse(virQEMUDriver *driver, qemuDomainObjPrivate *priv, const char *cookiein, int cookieinlen, - unsigned int flags); + unsigned int flags, + virDomainObj *vm); void qemuMigrationCookieFree(qemuMigrationCookie *mig); diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index c667be8520..7a023b36c8 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -1005,7 +1005,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriver *driver, qemuMigrationParams *migParams) { qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; g_autoptr(virJSONValue) tlsProps = NULL; g_autoptr(virJSONValue) secProps = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -1080,8 +1080,7 @@ int qemuMigrationParamsDisableTLS(virDomainObj *vm, qemuMigrationParams *migParams) { - qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; if (!jobPriv->migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) return 0; @@ -1213,8 +1212,7 @@ qemuMigrationParamsCheck(virDomainObj *vm, qemuMigrationParams *migParams, virBitmap *remoteCaps) { - qemuDomainObjPrivate *priv = vm->privateData; - qemuDomainJobPrivate *jobPriv = priv->job.privateData; + qemuDomainJobPrivate *jobPriv = vm->job->privateData; qemuMigrationCapability cap; qemuMigrationParty party; size_t i; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 251bca4bdf..71b476a32f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -648,8 +648,8 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, * reveal it in domain state nor sent events */ if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING && !priv->pausedShutdown) { - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) { - if (priv->job.current->status == VIR_DOMAIN_JOB_STATUS_POSTCOPY) + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) { + if (vm->job->current->status == VIR_DOMAIN_JOB_STATUS_POSTCOPY) reason = VIR_DOMAIN_PAUSED_POSTCOPY; else reason = VIR_DOMAIN_PAUSED_MIGRATION; @@ -661,8 +661,8 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, vm->def->name, virDomainPausedReasonTypeToString(reason), detail); - if (priv->job.current) - ignore_value(virTimeMillisNow(&priv->job.current->stopped)); + if (vm->job->current) + ignore_value(virTimeMillisNow(&vm->job->current->stopped)); if (priv->signalStop) virDomainObjBroadcast(vm); @@ -1390,7 +1390,6 @@ static void qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm) { - qemuDomainObjPrivate *priv; qemuDomainJobPrivate *jobPriv; virObjectLock(vm); @@ -1398,9 +1397,8 @@ qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED, VIR_DEBUG("Spice migration completed for domain %p %s", vm, vm->def->name); - priv = vm->privateData; - jobPriv = priv->job.privateData; - if (priv->job.asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) { + jobPriv = vm->job->privateData; + if (vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) { VIR_DEBUG("got SPICE_MIGRATE_COMPLETED event without a migration job"); goto cleanup; } @@ -1434,12 +1432,12 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED, priv = vm->privateData; driver = priv->driver; - if (priv->job.asyncJob == VIR_ASYNC_JOB_NONE) { + if (vm->job->asyncJob == VIR_ASYNC_JOB_NONE) { VIR_DEBUG("got MIGRATION event without a migration job"); goto cleanup; } - privJob = priv->job.current->privateData; + privJob = vm->job->current->privateData; privJob->stats.mig.status = status; virDomainObjBroadcast(vm); @@ -1448,7 +1446,7 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED, switch ((qemuMonitorMigrationStatus) status) { case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY: - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT && + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT && state == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_MIGRATION) { VIR_DEBUG("Correcting paused state reason for domain %s to %s", @@ -1464,7 +1462,7 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED, break; case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY_PAUSED: - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT && + if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT && state == VIR_DOMAIN_PAUSED) { /* At this point no thread is watching the migration progress on * the source as it is just waiting for the Finish phase to end. @@ -1505,11 +1503,11 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED, * watching it in any thread. Let's make sure the migration is properly * finished in case we get a "completed" event. */ - if (virDomainObjIsPostcopy(vm, priv->job.current->operation) && - priv->job.phase == QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && - priv->job.asyncOwner == 0) { + if (virDomainObjIsPostcopy(vm, vm->job->current->operation) && + vm->job->phase == QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && + vm->job->asyncOwner == 0) { qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_UNATTENDED_MIGRATION, - priv->job.asyncJob, status, NULL); + vm->job->asyncJob, status, NULL); } break; @@ -1546,7 +1544,7 @@ qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED, vm, vm->def->name, pass); priv = vm->privateData; - if (priv->job.asyncJob == VIR_ASYNC_JOB_NONE) { + if (vm->job->asyncJob == VIR_ASYNC_JOB_NONE) { VIR_DEBUG("got MIGRATION_PASS event without a migration job"); goto cleanup; } @@ -1566,7 +1564,6 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNUC_UNUSED, qemuMonitorDumpStats *stats, const char *error) { - qemuDomainObjPrivate *priv; qemuDomainJobPrivate *jobPriv; qemuDomainJobDataPrivate *privJobCurrent = NULL; @@ -1575,20 +1572,19 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNUC_UNUSED, VIR_DEBUG("Dump completed for domain %p %s with stats=%p error='%s'", vm, vm->def->name, stats, NULLSTR(error)); - priv = vm->privateData; - jobPriv = priv->job.privateData; - privJobCurrent = priv->job.current->privateData; - if (priv->job.asyncJob == VIR_ASYNC_JOB_NONE) { + jobPriv = vm->job->privateData; + privJobCurrent = vm->job->current->privateData; + if (vm->job->asyncJob == VIR_ASYNC_JOB_NONE) { VIR_DEBUG("got DUMP_COMPLETED event without a dump_completed job"); goto cleanup; } jobPriv->dumpCompleted = true; privJobCurrent->stats.dump = *stats; - priv->job.error = g_strdup(error); + vm->job->error = g_strdup(error); /* Force error if extracting the DUMP_COMPLETED status failed */ if (!error && status < 0) { - priv->job.error = g_strdup(virGetLastErrorMessage()); + vm->job->error = g_strdup(virGetLastErrorMessage()); privJobCurrent->stats.dump.status = QEMU_MONITOR_DUMP_STATUS_FAILED; } @@ -3209,8 +3205,8 @@ int qemuProcessStopCPUs(virQEMUDriver *driver, /* de-activate netdevs after stopping CPUs */ ignore_value(qemuInterfaceStopDevices(vm->def)); - if (priv->job.current) - ignore_value(virTimeMillisNow(&priv->job.current->stopped)); + if (vm->job->current) + ignore_value(virTimeMillisNow(&vm->job->current->stopped)); /* The STOP event handler will change the domain state with the reason * saved in priv->pausedReason and it will also emit corresponding domain @@ -3375,12 +3371,12 @@ qemuProcessCleanupMigrationJob(virQEMUDriver *driver, VIR_DEBUG("driver=%p, vm=%s, asyncJob=%s, state=%s, reason=%s", driver, vm->def->name, - virDomainAsyncJobTypeToString(priv->job.asyncJob), + virDomainAsyncJobTypeToString(vm->job->asyncJob), virDomainStateTypeToString(state), virDomainStateReasonToString(state, reason)); - if (priv->job.asyncJob != VIR_ASYNC_JOB_MIGRATION_IN && - priv->job.asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) + if (vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_IN && + vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) return; virPortAllocatorRelease(priv->migrationPort); @@ -3393,7 +3389,6 @@ static void qemuProcessRestoreMigrationJob(virDomainObj *vm, virDomainJobObj *job) { - qemuDomainObjPrivate *priv = vm->privateData; qemuDomainJobPrivate *jobPriv = job->privateData; virDomainJobOperation op; unsigned long long allowedJobs; @@ -3413,9 +3408,9 @@ qemuProcessRestoreMigrationJob(virDomainObj *vm, VIR_DOMAIN_JOB_STATUS_PAUSED, allowedJobs); - job->privateData = g_steal_pointer(&priv->job.privateData); - priv->job.privateData = jobPriv; - priv->job.apiFlags = job->apiFlags; + job->privateData = g_steal_pointer(&vm->job->privateData); + vm->job->privateData = jobPriv; + vm->job->apiFlags = job->apiFlags; qemuDomainCleanupAdd(vm, qemuProcessCleanupMigrationJob); } @@ -8109,9 +8104,9 @@ void qemuProcessStop(virQEMUDriver *driver, if (asyncJob != VIR_ASYNC_JOB_NONE) { if (qemuDomainObjBeginNestedJob(vm, asyncJob) < 0) goto cleanup; - } else if (priv->job.asyncJob != VIR_ASYNC_JOB_NONE && - priv->job.asyncOwner == virThreadSelfID() && - priv->job.active != VIR_JOB_ASYNC_NESTED) { + } else if (vm->job->asyncJob != VIR_ASYNC_JOB_NONE && + vm->job->asyncOwner == virThreadSelfID() && + vm->job->active != VIR_JOB_ASYNC_NESTED) { VIR_WARN("qemuProcessStop called without a nested job (async=%s)", virDomainAsyncJobTypeToString(asyncJob)); } @@ -8434,10 +8429,10 @@ qemuProcessAutoDestroy(virDomainObj *dom, VIR_DEBUG("vm=%s, conn=%p", dom->def->name, conn); - if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) + if (dom->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; - if (priv->job.asyncJob) { + if (dom->job->asyncJob) { VIR_DEBUG("vm=%s has long-term job active, cancelling", dom->def->name); qemuDomainObjDiscardAsyncJob(dom); @@ -8701,7 +8696,7 @@ qemuProcessReconnect(void *opaque) cfg = virQEMUDriverGetConfig(driver); priv = obj->privateData; - virDomainObjPreserveJob(&priv->job, &oldjob); + virDomainObjPreserveJob(obj->job, &oldjob); if (oldjob.asyncJob == VIR_ASYNC_JOB_MIGRATION_IN) stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; if (oldjob.asyncJob == VIR_ASYNC_JOB_BACKUP && priv->backup) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 6033deafed..243c18193b 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1334,7 +1334,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver, if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SNAPSHOT, 0)) goto cleanup; - qemuDomainJobSetStatsType(priv->job.current, + qemuDomainJobSetStatsType(vm->job->current, QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP); /* allow the migration job to be cancelled or the domain to be paused */ diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookiexmltest.c index 9731348b53..6f650213e2 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -146,7 +146,8 @@ testQemuMigrationCookieParse(const void *opaque) priv, data->xmlstr, data->xmlstrlen, - data->cookieParseFlags))) { + data->cookieParseFlags, + data->vm))) { VIR_TEST_DEBUG("\nfailed to parse qemu migration cookie:\n%s\n", data->xmlstr); return -1; } -- 2.37.2

This patch removes libxlDomainObjBeginJob() and replaces it with generalized virDomainObjBeginJob(). Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- src/libxl/libxl_domain.c | 62 ++----------------------------------- src/libxl/libxl_domain.h | 6 ---- src/libxl/libxl_driver.c | 48 ++++++++++++++-------------- src/libxl/libxl_migration.c | 6 ++-- 4 files changed, 29 insertions(+), 93 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 80a362df46..3a1b371054 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -43,64 +43,6 @@ VIR_LOG_INIT("libxl.libxl_domain"); -/* Give up waiting for mutex after 30 seconds */ -#define LIBXL_JOB_WAIT_TIME (1000ull * 30) - -/* - * obj must be locked before calling, libxlDriverPrivate *must NOT be locked - * - * This must be called by anything that will change the VM state - * in any way - * - * Upon successful return, the object will have its ref count increased, - * successful calls must be followed by EndJob eventually - */ -int -libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED, - virDomainObj *obj, - virDomainJob job) -{ - unsigned long long now; - unsigned long long then; - - if (virTimeMillisNow(&now) < 0) - return -1; - then = now + LIBXL_JOB_WAIT_TIME; - - while (obj->job->active) { - VIR_DEBUG("Wait normal job condition for starting job: %s", - virDomainJobTypeToString(job)); - if (virCondWaitUntil(&obj->job->cond, &obj->parent.lock, then) < 0) - goto error; - } - - virDomainObjResetJob(obj->job); - - VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job)); - obj->job->active = job; - obj->job->owner = virThreadSelfID(); - obj->job->started = now; - - return 0; - - error: - VIR_WARN("Cannot start job (%s) for domain %s;" - " current job is (%s) owned by (%llu)", - virDomainJobTypeToString(job), - obj->def->name, - virDomainJobTypeToString(obj->job->active), - obj->job->owner); - - if (errno == ETIMEDOUT) - virReportError(VIR_ERR_OPERATION_TIMEOUT, - "%s", _("cannot acquire state change lock")); - else - virReportSystemError(errno, - "%s", _("cannot acquire job mutex")); - - return -1; -} - /* * obj must be locked before calling * @@ -460,7 +402,7 @@ libxlDomainShutdownThread(void *opaque) goto cleanup; } - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (xl_reason == LIBXL_SHUTDOWN_REASON_POWEROFF) { @@ -589,7 +531,7 @@ libxlDomainDeathThread(void *opaque) goto cleanup; } - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_DESTROYED); diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 9e8804f747..b80552e30a 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -49,12 +49,6 @@ extern const struct libxl_event_hooks ev_hooks; int libxlDomainObjPrivateInitCtx(virDomainObj *vm); -int -libxlDomainObjBeginJob(libxlDriverPrivate *driver, - virDomainObj *obj, - virDomainJob job) - G_GNUC_WARN_UNUSED_RESULT; - void libxlDomainObjEndJob(libxlDriverPrivate *driver, virDomainObj *obj); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 0ae1ee95c4..d94430708a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -326,7 +326,7 @@ libxlAutostartDomain(virDomainObj *vm, virObjectLock(vm); virResetLastError(); - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (vm->autostart && !virDomainObjIsActive(vm) && @@ -1049,7 +1049,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *xml, NULL))) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) { + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) { if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); goto cleanup; @@ -1159,7 +1159,7 @@ libxlDomainSuspend(virDomainPtr dom) if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -1212,7 +1212,7 @@ libxlDomainResume(virDomainPtr dom) if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -1373,7 +1373,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -1446,7 +1446,7 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom, if (virDomainPMSuspendForDurationEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -1499,7 +1499,7 @@ libxlDomainPMWakeup(virDomainPtr dom, unsigned int flags) if (virDomainPMWakeupEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PMSUSPENDED) { @@ -1633,7 +1633,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, if (virDomainSetMemoryFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainLiveConfigHelperMethod(cfg->caps, driver->xmlopt, vm, &flags, @@ -1902,7 +1902,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, if (virDomainSaveFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -1967,7 +1967,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from, NULL))) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) { + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) { if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); goto cleanup; @@ -2014,7 +2014,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) if (virDomainCoreDumpEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -2103,7 +2103,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) if (virDomainManagedSaveEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -2248,7 +2248,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if (virDomainSetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (!virDomainObjIsActive(vm) && (flags & VIR_DOMAIN_VCPU_LIVE)) { @@ -2446,7 +2446,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainLiveConfigHelperMethod(cfg->caps, driver->xmlopt, vm, @@ -2777,7 +2777,7 @@ libxlDomainCreateWithFlags(virDomainPtr dom, if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjIsActive(vm)) { @@ -4095,7 +4095,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, if (virDomainAttachDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) @@ -4189,7 +4189,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, if (virDomainDetachDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) @@ -4477,7 +4477,7 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) if (virDomainSetAutostartEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (!vm->persistent) { @@ -4683,7 +4683,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -5000,7 +5000,7 @@ libxlDomainInterfaceStats(virDomainPtr dom, if (virDomainInterfaceStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -5168,7 +5168,7 @@ libxlDomainMemoryStats(virDomainPtr dom, if (virDomainMemoryStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -5522,7 +5522,7 @@ libxlDomainBlockStats(virDomainPtr dom, if (virDomainBlockStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -5572,7 +5572,7 @@ libxlDomainBlockStatsFlags(virDomainPtr dom, if (virDomainBlockStatsFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -6368,7 +6368,7 @@ libxlDomainSetMetadata(virDomainPtr dom, if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 800a6b0365..90cf12ae00 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -383,7 +383,7 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, * terminated in the confirm phase. Errors in the begin or perform * phase will also terminate the job. */ - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (!(mig = libxlMigrationCookieNew(vm))) @@ -553,7 +553,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, * Unless an error is encountered in this function, the job will * be terminated in the finish phase. */ - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto error; priv = vm->privateData; @@ -662,7 +662,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, * Unless an error is encountered in this function, the job will * be terminated in the finish phase. */ - if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto error; priv = vm->privateData; -- 2.37.2

This patch removes virCHDomainObjBeginJob() and replaces it with call to the generalized virDomainObjBeginJob(). Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- src/ch/ch_domain.c | 51 +--------------------------------------------- src/ch/ch_domain.h | 4 ---- src/ch/ch_driver.c | 20 +++++++++--------- 3 files changed, 11 insertions(+), 64 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 9ddf9a8584..c592c6ffbb 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -32,60 +32,11 @@ VIR_LOG_INIT("ch.ch_domain"); -/* - * obj must be locked before calling, virCHDriver must NOT be locked - * - * This must be called by anything that will change the VM state - * in any way - * - * Upon successful return, the object will have its ref count increased. - * Successful calls must be followed by EndJob eventually. - */ -int -virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job) -{ - unsigned long long now; - unsigned long long then; - - if (virTimeMillisNow(&now) < 0) - return -1; - then = now + CH_JOB_WAIT_TIME; - - while (obj->job->active) { - VIR_DEBUG("Wait normal job condition for starting job: %s", - virDomainJobTypeToString(job)); - if (virCondWaitUntil(&obj->job->cond, &obj->parent.lock, then) < 0) { - VIR_WARN("Cannot start job (%s) for domain %s;" - " current job is (%s) owned by (%llu)", - virDomainJobTypeToString(job), - obj->def->name, - virDomainJobTypeToString(obj->job->active), - obj->job->owner); - - if (errno == ETIMEDOUT) - virReportError(VIR_ERR_OPERATION_TIMEOUT, - "%s", _("cannot acquire state change lock")); - else - virReportSystemError(errno, - "%s", _("cannot acquire job mutex")); - return -1; - } - } - - virDomainObjResetJob(obj->job); - - VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job)); - obj->job->active = job; - obj->job->owner = virThreadSelfID(); - - return 0; -} - /* * obj must be locked and have a reference before calling * * To be called after completing the work associated with the - * earlier virCHDomainBeginJob() call + * earlier virDomainObjBeginJob() call */ void virCHDomainObjEndJob(virDomainObj *obj) diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index c7dfde601e..076043f772 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -60,10 +60,6 @@ struct _virCHDomainVcpuPrivate { extern virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks; extern virDomainDefParserConfig virCHDriverDomainDefParserConfig; -int -virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job) - G_GNUC_WARN_UNUSED_RESULT; - void virCHDomainObjEndJob(virDomainObj *obj); diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index bde148075d..d81bddcc23 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -217,7 +217,7 @@ chDomainCreateXML(virConnectPtr conn, NULL))) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED) < 0) @@ -251,7 +251,7 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; ret = virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED); @@ -390,7 +390,7 @@ chDomainShutdownFlags(virDomainPtr dom, if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -446,7 +446,7 @@ chDomainReboot(virDomainPtr dom, unsigned int flags) if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -495,7 +495,7 @@ chDomainSuspend(virDomainPtr dom) if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -540,7 +540,7 @@ chDomainResume(virDomainPtr dom) if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -594,7 +594,7 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int flags) if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_DESTROY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_DESTROY) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) @@ -1218,7 +1218,7 @@ chDomainPinVcpuFlags(virDomainPtr dom, if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) @@ -1355,7 +1355,7 @@ chDomainPinEmulator(virDomainPtr dom, if (virDomainPinEmulatorEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) @@ -1626,7 +1626,7 @@ chDomainSetNumaParameters(virDomainPtr dom, } } - if (virCHDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) -- 2.37.2

On Mon, Sep 5, 2022 at 6:21 PM Ján Tomko <jtomko(a)redhat.com&gt; wrote: Thank you for noticing, that would be great. Kristina

This patch removes libxlDomainObjEndJob() and replaces it with call to the generalized virDomainObjEndJob(). Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- src/libxl/libxl_domain.c | 27 ++------------------ src/libxl/libxl_domain.h | 4 --- src/libxl/libxl_driver.c | 51 +++++++++++++++++-------------------- src/libxl/libxl_migration.c | 14 +++++----- 4 files changed, 33 insertions(+), 63 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 3a1b371054..2d53250895 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -43,29 +43,6 @@ VIR_LOG_INIT("libxl.libxl_domain"); -/* - * obj must be locked before calling - * - * To be called after completing the work associated with the - * earlier libxlDomainBeginJob() call - * - * Returns true if the remaining reference count on obj is - * non-zero, false if the reference count has dropped to zero - * and obj is disposed. - */ -void -libxlDomainObjEndJob(libxlDriverPrivate *driver G_GNUC_UNUSED, - virDomainObj *obj) -{ - virDomainJob job = obj->job->active; - - VIR_DEBUG("Stopping job: %s", - virDomainJobTypeToString(job)); - - virDomainObjResetJob(obj->job); - virCondSignal(&obj->job->cond); -} - int libxlDomainJobGetTimeElapsed(virDomainJobObj *job, unsigned long long *timeElapsed) { @@ -505,7 +482,7 @@ libxlDomainShutdownThread(void *opaque) } endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -541,7 +518,7 @@ libxlDomainDeathThread(void *opaque) libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, dom_event); cleanup: diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index b80552e30a..94b693e477 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -49,10 +49,6 @@ extern const struct libxl_event_hooks ev_hooks; int libxlDomainObjPrivateInitCtx(virDomainObj *vm); -void -libxlDomainObjEndJob(libxlDriverPrivate *driver, - virDomainObj *obj); - int libxlDomainJobGetTimeElapsed(virDomainJobObj *job, unsigned long long *timeElapsed); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d94430708a..79af2f4441 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -340,7 +340,7 @@ libxlAutostartDomain(virDomainObj *vm, ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1065,7 +1065,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *xml, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1185,7 +1185,7 @@ libxlDomainSuspend(virDomainPtr dom) ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1239,7 +1239,7 @@ libxlDomainResume(virDomainPtr dom) ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1398,7 +1398,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1472,7 +1472,7 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom, ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1537,7 +1537,7 @@ libxlDomainPMWakeup(virDomainPtr dom, unsigned int flags) libxlDomainCleanup(driver, vm); endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1696,7 +1696,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1917,7 +1917,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1979,7 +1979,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from, if (ret < 0 && !vm->persistent) virDomainObjListRemove(driver->domains, vm); - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: if (VIR_CLOSE(fd) < 0) @@ -2076,7 +2076,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) } endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2129,7 +2129,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2344,7 +2344,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, } endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: VIR_FREE(bitmask); @@ -2489,7 +2489,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, } endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2793,7 +2793,7 @@ libxlDomainCreateWithFlags(virDomainPtr dom, dom->id = vm->def->id; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -4152,7 +4152,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainDeviceDefFree(devConf); @@ -4240,7 +4240,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainDeviceDefFree(dev); @@ -4522,7 +4522,7 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -4723,7 +4723,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -4989,7 +4989,6 @@ libxlDomainInterfaceStats(virDomainPtr dom, const char *device, virDomainInterfaceStatsPtr stats) { - libxlDriverPrivate *driver = dom->conn->privateData; virDomainObj *vm; virDomainNetDef *net = NULL; int ret = -1; @@ -5016,7 +5015,7 @@ libxlDomainInterfaceStats(virDomainPtr dom, ret = 0; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -5189,7 +5188,7 @@ libxlDomainMemoryStats(virDomainPtr dom, ret = i; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: libxl_dominfo_dispose(&d_info); @@ -5511,7 +5510,6 @@ libxlDomainBlockStats(virDomainPtr dom, const char *path, virDomainBlockStatsPtr stats) { - libxlDriverPrivate *driver = dom->conn->privateData; virDomainObj *vm; libxlBlockStats blkstats; int ret = -1; @@ -5542,7 +5540,7 @@ libxlDomainBlockStats(virDomainPtr dom, stats->errs = -1; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -5556,7 +5554,6 @@ libxlDomainBlockStatsFlags(virDomainPtr dom, int *nparams, unsigned int flags) { - libxlDriverPrivate *driver = dom->conn->privateData; virDomainObj *vm; libxlBlockStats blkstats; int nstats; @@ -5615,7 +5612,7 @@ libxlDomainBlockStatsFlags(virDomainPtr dom, #undef LIBXL_BLKSTAT_ASSIGN_PARAM endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -6381,7 +6378,7 @@ libxlDomainSetMetadata(virDomainPtr dom, virObjectEventStateQueue(driver->domainEventState, ev); } - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 90cf12ae00..6048540334 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -417,7 +417,7 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, goto cleanup; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); cleanup: libxlMigrationCookieFree(mig); @@ -604,7 +604,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, goto done; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); error: libxlMigrationCookieFree(mig); @@ -774,7 +774,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, goto done; endjob: - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); error: for (i = 0; i < nsocks; i++) { @@ -1155,7 +1155,7 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivate *driver, * Confirm phase will not be executed if perform fails. End the * job started in begin phase. */ - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); } cleanup: @@ -1226,7 +1226,7 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver, * Confirm phase will not be executed if perform fails. End the * job started in begin phase. */ - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); } return ret; @@ -1327,7 +1327,7 @@ libxlDomainMigrationDstFinish(virConnectPtr dconn, } /* EndJob for corresponding BeginJob in prepare phase */ - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return dom; @@ -1384,7 +1384,7 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivate *driver, cleanup: /* EndJob for corresponding BeginJob in begin phase */ - libxlDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; -- 2.37.2

This patch removes virCHDomainObjEndJob() and replaces it with call to the generalized virDomainObjEndJob(). Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- src/ch/ch_domain.c | 18 ------------------ src/ch/ch_domain.h | 3 --- src/ch/ch_driver.c | 20 ++++++++++---------- 3 files changed, 10 insertions(+), 31 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index c592c6ffbb..dc666243a4 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -32,24 +32,6 @@ VIR_LOG_INIT("ch.ch_domain"); -/* - * obj must be locked and have a reference before calling - * - * To be called after completing the work associated with the - * earlier virDomainObjBeginJob() call - */ -void -virCHDomainObjEndJob(virDomainObj *obj) -{ - virDomainJob job = obj->job->active; - - VIR_DEBUG("Stopping job: %s", - virDomainJobTypeToString(job)); - - virDomainObjResetJob(obj->job); - virCondSignal(&obj->job->cond); -} - void virCHDomainRemoveInactive(virCHDriver *driver, virDomainObj *vm) diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index 076043f772..88e27d50b1 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -60,9 +60,6 @@ struct _virCHDomainVcpuPrivate { extern virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks; extern virDomainDefParserConfig virCHDriverDomainDefParserConfig; -void -virCHDomainObjEndJob(virDomainObj *obj); - void virCHDomainRemoveInactive(virCHDriver *driver, virDomainObj *vm); diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index d81bddcc23..c6e92efb2c 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -226,7 +226,7 @@ chDomainCreateXML(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: if (vm && !dom) { @@ -256,7 +256,7 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) ret = virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED); - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -414,7 +414,7 @@ chDomainShutdownFlags(virDomainPtr dom, ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -473,7 +473,7 @@ chDomainReboot(virDomainPtr dom, unsigned int flags) ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -518,7 +518,7 @@ chDomainSuspend(virDomainPtr dom) ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -563,7 +563,7 @@ chDomainResume(virDomainPtr dom) ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -607,7 +607,7 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int flags) ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1254,7 +1254,7 @@ chDomainPinVcpuFlags(virDomainPtr dom, ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1418,7 +1418,7 @@ chDomainPinEmulator(virDomainPtr dom, ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1680,7 +1680,7 @@ chDomainSetNumaParameters(virDomainPtr dom, ret = 0; endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); -- 2.37.2

Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com&gt; --- docs/kbase/internals/qemu-threads.rst | 12 +++++------ src/conf/virdomainjob.c | 30 +++++++++++++++++++++++++++ src/conf/virdomainjob.h | 6 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_backup.c | 6 +++--- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domainjob.c | 29 -------------------------- src/qemu/qemu_domainjob.h | 6 ------ src/qemu/qemu_driver.c | 18 ++++++++-------- src/qemu/qemu_migration.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_snapshot.c | 4 ++-- 12 files changed, 63 insertions(+), 60 deletions(-) diff --git a/docs/kbase/internals/qemu-threads.rst b/docs/kbase/internals/qemu-threads.rst index afdf9e61cc..95681d1b9d 100644 --- a/docs/kbase/internals/qemu-threads.rst +++ b/docs/kbase/internals/qemu-threads.rst @@ -141,7 +141,7 @@ To acquire the agent job condition To acquire the asynchronous job condition - ``qemuDomainObjBeginAsyncJob()`` + ``virDomainObjBeginAsyncJob()`` - Waits until no async job is running - Waits for ``job.cond`` condition ``job.active != 0`` using ``virDomainObj`` mutex @@ -149,7 +149,7 @@ To acquire the asynchronous job condition and repeats waiting in that case - Sets ``job.asyncJob`` to the asynchronous job type - ``qemuDomainObjEndAsyncJob()`` + ``virDomainObjEndAsyncJob()`` - Sets ``job.asyncJob`` to 0 - Broadcasts on ``job.asyncCond`` condition @@ -277,7 +277,7 @@ Design patterns obj = qemuDomObjFromDomain(dom); - qemuDomainObjBeginAsyncJob(obj, VIR_ASYNC_JOB_TYPE); + virDomainObjBeginAsyncJob(obj, VIR_ASYNC_JOB_TYPE); qemuDomainObjSetAsyncJobMask(obj, allowedJobs); ...do prep work... @@ -306,7 +306,7 @@ Design patterns ...do final work... - qemuDomainObjEndAsyncJob(obj); + virDomainObjEndAsyncJob(obj); virDomainObjEndAPI(&obj); @@ -317,7 +317,7 @@ Design patterns obj = qemuDomObjFromDomain(dom); - qemuDomainObjBeginAsyncJob(obj, VIR_ASYNC_JOB_TYPE); + virDomainObjBeginAsyncJob(obj, VIR_ASYNC_JOB_TYPE); ...do prep work... @@ -334,5 +334,5 @@ Design patterns ...do final work... - qemuDomainObjEndAsyncJob(obj); + virDomainObjEndAsyncJob(obj); virDomainObjEndAPI(&obj); diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index dfb28df6f9..feb8c0e971 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -544,6 +544,21 @@ virDomainObjBeginAgentJob(virDomainObj *obj, VIR_ASYNC_JOB_NONE, false); } +int virDomainObjBeginAsyncJob(virDomainObj *obj, + virDomainAsyncJob asyncJob, + virDomainJobOperation operation, + unsigned long apiFlags) +{ + if (virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC, + VIR_AGENT_JOB_NONE, + asyncJob, false) < 0) + return -1; + + obj->job->current->operation = operation; + obj->job->apiFlags = apiFlags; + return 0; +} + /* * obj must be locked and have a reference before calling * @@ -589,3 +604,18 @@ virDomainObjEndAgentJob(virDomainObj *obj) * grabbing a job requires checking more variables. */ virCondBroadcast(&obj->job->cond); } + +void +virDomainObjEndAsyncJob(virDomainObj *obj) +{ + obj->job->jobsQueued--; + + VIR_DEBUG("Stopping async job: %s (vm=%p name=%s)", + virDomainAsyncJobTypeToString(obj->job->asyncJob), + obj, obj->def->name); + + virDomainObjResetAsyncJob(obj->job); + if (obj->job->cb->saveStatusPrivate) + obj->job->cb->saveStatusPrivate(obj); + virCondBroadcast(&obj->job->asyncCond); +} diff --git a/src/conf/virdomainjob.h b/src/conf/virdomainjob.h index 6cec322af1..3cd02ef4ae 100644 --- a/src/conf/virdomainjob.h +++ b/src/conf/virdomainjob.h @@ -252,6 +252,12 @@ int virDomainObjBeginJob(virDomainObj *obj, int virDomainObjBeginAgentJob(virDomainObj *obj, virDomainAgentJob agentJob) G_GNUC_WARN_UNUSED_RESULT; +int virDomainObjBeginAsyncJob(virDomainObj *obj, + virDomainAsyncJob asyncJob, + virDomainJobOperation operation, + unsigned long apiFlags) + G_GNUC_WARN_UNUSED_RESULT; void virDomainObjEndJob(virDomainObj *obj); void virDomainObjEndAgentJob(virDomainObj *obj); +void virDomainObjEndAsyncJob(virDomainObj *obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 74988dec34..254abd5084 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1188,11 +1188,13 @@ virDomainJobTypeFromString; virDomainJobTypeToString; virDomainNestedJobAllowed; virDomainObjBeginAgentJob; +virDomainObjBeginAsyncJob; virDomainObjBeginJob; virDomainObjBeginJobInternal; virDomainObjCanSetJob; virDomainObjClearJob; virDomainObjEndAgentJob; +virDomainObjEndAsyncJob; virDomainObjEndJob; virDomainObjInitJob; virDomainObjPreserveJob; diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 2da520dbc7..c7721812a5 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -618,7 +618,7 @@ qemuBackupJobTerminate(virDomainObj *vm, g_clear_pointer(&priv->backup, virDomainBackupDefFree); if (vm->job->asyncJob == VIR_ASYNC_JOB_BACKUP) - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); } @@ -786,7 +786,7 @@ qemuBackupBegin(virDomainObj *vm, * infrastructure for async jobs. We'll allow standard modify-type jobs * as the interlocking of conflicting operations is handled on the block * job level */ - if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_BACKUP, + if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_BACKUP, VIR_DOMAIN_JOB_OPERATION_BACKUP, flags) < 0) return -1; @@ -937,7 +937,7 @@ qemuBackupBegin(virDomainObj *vm, if (ret == 0) qemuDomainObjReleaseAsyncJob(vm); else - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); return ret; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab05bed456..83d78900a6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6037,7 +6037,7 @@ void qemuDomainObjEnterMonitor(virDomainObj *obj) * To be called immediately before any QEMU monitor API call. * Must have already either called virDomainObjBeginJob() * and checked that the VM is still active, with asyncJob of - * VIR_ASYNC_JOB_NONE; or already called qemuDomainObjBeginAsyncJob, + * VIR_ASYNC_JOB_NONE; or already called virDomainObjBeginAsyncJob, * with the same asyncJob. * * Returns 0 if job was started, in which case this must be followed with diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 0775e04add..99dcdb49b9 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -655,21 +655,6 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj) obj->job->asyncOwner = 0; } -int qemuDomainObjBeginAsyncJob(virDomainObj *obj, - virDomainAsyncJob asyncJob, - virDomainJobOperation operation, - unsigned long apiFlags) -{ - if (virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC, - VIR_AGENT_JOB_NONE, - asyncJob, false) < 0) - return -1; - - obj->job->current->operation = operation; - obj->job->apiFlags = apiFlags; - return 0; -} - int qemuDomainObjBeginNestedJob(virDomainObj *obj, virDomainAsyncJob asyncJob) @@ -714,20 +699,6 @@ qemuDomainObjBeginJobNowait(virDomainObj *obj, VIR_ASYNC_JOB_NONE, true); } -void -qemuDomainObjEndAsyncJob(virDomainObj *obj) -{ - obj->job->jobsQueued--; - - VIR_DEBUG("Stopping async job: %s (vm=%p name=%s)", - virDomainAsyncJobTypeToString(obj->job->asyncJob), - obj, obj->def->name); - - virDomainObjResetAsyncJob(obj->job); - qemuDomainSaveStatus(obj); - virCondBroadcast(&obj->job->asyncCond); -} - void qemuDomainObjAbortAsyncJob(virDomainObj *obj) { diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 0cc4dc44f3..1cf9fcc113 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -69,11 +69,6 @@ int qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, virDomainObj *vm); -int qemuDomainObjBeginAsyncJob(virDomainObj *obj, - virDomainAsyncJob asyncJob, - virDomainJobOperation operation, - unsigned long apiFlags) - G_GNUC_WARN_UNUSED_RESULT; int qemuDomainObjBeginNestedJob(virDomainObj *obj, virDomainAsyncJob asyncJob) G_GNUC_WARN_UNUSED_RESULT; @@ -81,7 +76,6 @@ int qemuDomainObjBeginJobNowait(virDomainObj *obj, virDomainJob job) G_GNUC_WARN_UNUSED_RESULT; -void qemuDomainObjEndAsyncJob(virDomainObj *obj); void qemuDomainObjAbortAsyncJob(virDomainObj *obj); void qemuDomainObjSetJobPhase(virDomainObj *obj, int phase); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7cabd32b64..379ec95dc5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2637,8 +2637,8 @@ qemuDomainSaveInternal(virQEMUDriver *driver, virQEMUSaveData *data = NULL; g_autoptr(qemuDomainSaveCookie) cookie = NULL; - if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_SAVE, - VIR_DOMAIN_JOB_OPERATION_SAVE, flags) < 0) + if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_SAVE, + VIR_DOMAIN_JOB_OPERATION_SAVE, flags) < 0) goto cleanup; if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SAVE, 0)) @@ -2735,7 +2735,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, virErrorRestore(&save_err); } } - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); if (ret == 0) qemuDomainRemoveInactive(driver, vm); @@ -3209,7 +3209,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, if (virDomainCoreDumpWithFormatEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, + if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) goto cleanup; @@ -3275,7 +3275,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, } } - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); if (ret == 0 && flags & VIR_DUMP_CRASH) qemuDomainRemoveInactive(driver, vm); @@ -3447,7 +3447,7 @@ processWatchdogEvent(virQEMUDriver *driver, switch (action) { case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: - if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, + if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) { return; @@ -3475,7 +3475,7 @@ processWatchdogEvent(virQEMUDriver *driver, } endjob: - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); } static int @@ -3523,7 +3523,7 @@ processGuestPanicEvent(virQEMUDriver *driver, bool removeInactive = false; unsigned long flags = VIR_DUMP_MEMORY_ONLY; - if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, + if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) return; @@ -3587,7 +3587,7 @@ processGuestPanicEvent(virQEMUDriver *driver, } endjob: - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); if (removeInactive) qemuDomainRemoveInactive(driver, vm); } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 38c2f6fdfd..d00de9cc32 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -120,7 +120,7 @@ qemuMigrationJobStart(virDomainObj *vm, } mask |= JOB_MASK(VIR_JOB_MODIFY_MIGRATION_SAFE); - if (qemuDomainObjBeginAsyncJob(vm, job, op, apiFlags) < 0) + if (virDomainObjBeginAsyncJob(vm, job, op, apiFlags) < 0) return -1; qemuDomainJobSetStatsType(vm->job->current, @@ -203,7 +203,7 @@ qemuMigrationJobIsActive(virDomainObj *vm, static void ATTRIBUTE_NONNULL(1) qemuMigrationJobFinish(virDomainObj *vm) { - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 94429bf3f8..c0338d25d2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4678,7 +4678,7 @@ qemuProcessBeginJob(virDomainObj *vm, virDomainJobOperation operation, unsigned long apiFlags) { - if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_START, + if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_START, operation, apiFlags) < 0) return -1; @@ -4690,7 +4690,7 @@ qemuProcessBeginJob(virDomainObj *vm, void qemuProcessEndJob(virDomainObj *vm) { - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); } diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index c5e5e3ed5b..d2835ab1a8 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1794,7 +1794,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, * a regular job, so we need to set the job mask to disallow query as * 'savevm' blocks the monitor. External snapshot will then modify the * job mask appropriately. */ - if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_SNAPSHOT, + if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_SNAPSHOT, VIR_DOMAIN_JOB_OPERATION_SNAPSHOT, flags) < 0) return NULL; @@ -1806,7 +1806,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, snapshot = qemuSnapshotCreate(vm, domain, def, driver, cfg, flags); } - qemuDomainObjEndAsyncJob(vm); + virDomainObjEndAsyncJob(vm); return snapshot; } -- 2.37.2