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

hypervisor: domain_job: add JobData private callbacks into virDomainJobObj

Browse Source 
We need this callback structure for qemu driver only, but it
makes more sense to include it in the virDomainJobObj in case of
other future additions than as a parameter of a beginJob
functions.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Kristina Hanicova 2022-08-10 14:57:04 +02:00 committed by Ján Tomko
parent 42543a083a
commit 377924ea08
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ch/ch_domain.c
View File

@ -117,7 +117,7 @@ virCHDomainObjPrivateAlloc(void *opaque)
priv = g_new0(virCHDomainObjPrivate, 1);
if (virDomainObjInitJob(&priv->job, NULL) < 0) {
if (virDomainObjInitJob(&priv->job, NULL, NULL) < 0) {
g_free(priv);
return NULL;
}

4
src/hypervisor/domain_job.c
View File

@ -116,10 +116,12 @@ virDomainJobStatusToType(virDomainJobStatus status)
int
virDomainObjInitJob(virDomainJobObj *job,
virDomainObjPrivateJobCallbacks *cb)
virDomainObjPrivateJobCallbacks *cb,
virDomainJobDataPrivateDataCallbacks *jobDataPrivateCb)
{
memset(job, 0, sizeof(*job));
job->cb = cb;
job->jobDataPrivateCb = jobDataPrivateCb;
if (virCondInit(&job->cond) < 0)
return -1;

5
src/hypervisor/domain_job.h
View File

@ -185,6 +185,8 @@ struct _virDomainJobObj {
void *privateData; /* job specific collection of data */
virDomainObjPrivateJobCallbacks *cb;
virDomainJobDataPrivateDataCallbacks *jobDataPrivateCb; /* callbacks for privateData of
virDomainJobData, can be NULL */
};
@ -210,7 +212,8 @@ struct _virDomainObjPrivateJobCallbacks {
int virDomainObjInitJob(virDomainJobObj *job,
virDomainObjPrivateJobCallbacks *cb);
virDomainObjPrivateJobCallbacks *cb,
virDomainJobDataPrivateDataCallbacks *jobDataPrivateCb);
void virDomainObjResetJob(virDomainJobObj *job);

2
src/libxl/libxl_domain.c
View File

@ -161,7 +161,7 @@ libxlDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
return NULL;
}
if (virDomainObjInitJob(&priv->job, NULL) < 0) {
if (virDomainObjInitJob(&priv->job, NULL, NULL) < 0) {
virChrdevFree(priv->devs);
g_free(priv);
return NULL;

2
src/lxc/lxc_domain.c
View File

@ -120,7 +120,7 @@ virLXCDomainObjPrivateAlloc(void *opaque)
{
virLXCDomainObjPrivate *priv = g_new0(virLXCDomainObjPrivate, 1);
if (virDomainObjInitJob(&priv->job, NULL) < 0) {
if (virDomainObjInitJob(&priv->job, NULL, NULL) < 0) {
g_free(priv);
return NULL;
}

3
src/qemu/qemu_domain.c
View File

@ -1760,7 +1760,8 @@ qemuDomainObjPrivateAlloc(void *opaque)
g_autoptr(qemuDomainObjPrivate) priv = g_new0(qemuDomainObjPrivate, 1);
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(opaque);
if (virDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) {
if (virDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks,
&qemuJobDataPrivateDataCallbacks) < 0) {
virReportSystemError(errno, "%s",
_("Unable to init qemu driver mutexes"));
return NULL;

2
src/qemu/qemu_domainjob.c
View File

@ -817,7 +817,7 @@ qemuDomainObjBeginJobInternal(virDomainObj *obj,
virDomainAsyncJobTypeToString(asyncJob),
obj, obj->def->name);
virDomainObjResetAsyncJob(&priv->job);
priv->job.current = virDomainJobDataInit(&qemuJobDataPrivateDataCallbacks);
priv->job.current = virDomainJobDataInit(priv->job.jobDataPrivateCb);
priv->job.current->status = VIR_DOMAIN_JOB_STATUS_ACTIVE;
priv->job.asyncJob = asyncJob;
priv->job.asyncOwner = virThreadSelfID();