NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu & hypervisor: move qemuDomainObjResetAsyncJob() into hypervisor

Browse Source 
This patch moves qemuDomainObjResetAsyncJob() as
virDomainObjResetAsyncJob() into hypervisor.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2022-08-03 14:43:13 +02:00 committed by Michal Privoznik
parent 7bbc465b45
commit 36435967f6
4 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hypervisor/domain_job.c
View File

@ -9,6 +9,7 @@
#include <string.h> #include <string.h>
#include "domain_job.h" #include "domain_job.h"
#include "viralloc.h"
VIR_ENUM_IMPL(virDomainJob, VIR_ENUM_IMPL(virDomainJob,
@ -155,3 +156,21 @@ virDomainObjResetAgentJob(virDomainJobObj *job)
g_clear_pointer(&job->agentOwnerAPI, g_free); g_clear_pointer(&job->agentOwnerAPI, g_free);
job->agentStarted = 0; job->agentStarted = 0;
} }
void
virDomainObjResetAsyncJob(virDomainJobObj *job)
{
job->asyncJob = VIR_ASYNC_JOB_NONE;
job->asyncOwner = 0;
g_clear_pointer(&job->asyncOwnerAPI, g_free);
job->asyncStarted = 0;
job->phase = 0;
job->mask = VIR_JOB_DEFAULT_MASK;
job->abortJob = false;
VIR_FREE(job->error);
g_clear_pointer(&job->current, virDomainJobDataFree);
job->apiFlags = 0;
if (job->cb)
job->cb->resetJobPrivate(job->privateData);
}

2
src/hypervisor/domain_job.h
View File

@ -212,3 +212,5 @@ int virDomainObjInitJob(virDomainJobObj *job,
void virDomainObjResetJob(virDomainJobObj *job); void virDomainObjResetJob(virDomainJobObj *job);
void virDomainObjResetAgentJob(virDomainJobObj *job); void virDomainObjResetAgentJob(virDomainJobObj *job);
void virDomainObjResetAsyncJob(virDomainJobObj *job);

1
src/libvirt_private.syms
View File

@ -1596,6 +1596,7 @@ virDomainJobTypeFromString;
virDomainJobTypeToString; virDomainJobTypeToString;
virDomainObjInitJob; virDomainObjInitJob;
virDomainObjResetAgentJob; virDomainObjResetAgentJob;
virDomainObjResetAsyncJob;
virDomainObjResetJob; virDomainObjResetJob;

29
src/qemu/qemu_domainjob.c
View File

@ -150,25 +150,6 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver,
} }
static void
qemuDomainObjResetAsyncJob(virDomainJobObj *job)
{
job->asyncJob = VIR_ASYNC_JOB_NONE;
job->asyncOwner = 0;
g_clear_pointer(&job->asyncOwnerAPI, g_free);
job->asyncStarted = 0;
job->phase = 0;
job->mask = VIR_JOB_DEFAULT_MASK;
job->abortJob = false;
VIR_FREE(job->error);
g_clear_pointer(&job->current, virDomainJobDataFree);
job->apiFlags = 0;
if (job->cb)
job->cb->resetJobPrivate(job->privateData);
}
/** /**
* qemuDomainObjPreserveJob * qemuDomainObjPreserveJob
* @param obj domain with a job that needs to be preserved * @param obj domain with a job that needs to be preserved
@ -200,7 +181,7 @@ qemuDomainObjPreserveJob(virDomainObj *obj,
job->cb = priv->job.cb; job->cb = priv->job.cb;
virDomainObjResetJob(&priv->job); virDomainObjResetJob(&priv->job);
qemuDomainObjResetAsyncJob(&priv->job); virDomainObjResetAsyncJob(&priv->job);
return 0; return 0;
} }
@ -244,7 +225,7 @@ void
qemuDomainObjClearJob(virDomainJobObj *job) qemuDomainObjClearJob(virDomainJobObj *job)
{ {
virDomainObjResetJob(job); virDomainObjResetJob(job);
qemuDomainObjResetAsyncJob(job); virDomainObjResetAsyncJob(job);
g_clear_pointer(&job->current, virDomainJobDataFree); g_clear_pointer(&job->current, virDomainJobDataFree);
g_clear_pointer(&job->completed, virDomainJobDataFree); g_clear_pointer(&job->completed, virDomainJobDataFree);
virCondDestroy(&job->cond); virCondDestroy(&job->cond);
@ -753,7 +734,7 @@ qemuDomainObjDiscardAsyncJob(virDomainObj *obj)
if (priv->job.active == VIR_JOB_ASYNC_NESTED) if (priv->job.active == VIR_JOB_ASYNC_NESTED)
virDomainObjResetJob(&priv->job); virDomainObjResetJob(&priv->job);
qemuDomainObjResetAsyncJob(&priv->job); virDomainObjResetAsyncJob(&priv->job);
qemuDomainSaveStatus(obj); qemuDomainSaveStatus(obj);
} }
@ -914,7 +895,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver,
VIR_DEBUG("Started async job: %s (vm=%p name=%s)", VIR_DEBUG("Started async job: %s (vm=%p name=%s)",
virDomainAsyncJobTypeToString(asyncJob), virDomainAsyncJobTypeToString(asyncJob),
obj, obj->def->name); obj, obj->def->name);
qemuDomainObjResetAsyncJob(&priv->job); virDomainObjResetAsyncJob(&priv->job);
priv->job.current = virDomainJobDataInit(&qemuJobDataPrivateDataCallbacks); priv->job.current = virDomainJobDataInit(&qemuJobDataPrivateDataCallbacks);
priv->job.current->status = VIR_DOMAIN_JOB_STATUS_ACTIVE; priv->job.current->status = VIR_DOMAIN_JOB_STATUS_ACTIVE;
priv->job.asyncJob = asyncJob; priv->job.asyncJob = asyncJob;
@ -1198,7 +1179,7 @@ qemuDomainObjEndAsyncJob(virDomainObj *obj)
virDomainAsyncJobTypeToString(priv->job.asyncJob), virDomainAsyncJobTypeToString(priv->job.asyncJob),
obj, obj->def->name); obj, obj->def->name);
qemuDomainObjResetAsyncJob(&priv->job); virDomainObjResetAsyncJob(&priv->job);
qemuDomainSaveStatus(obj); qemuDomainSaveStatus(obj);
virCondBroadcast(&priv->job.asyncCond); virCondBroadcast(&priv->job.asyncCond);
} }