[PATCH 2/5] hypervisor: domain_job: rename members in virDomainObjPrivateJobCallbacks
This patch alters members of virDomainObjPrivateJobCallbacks to
make the code more consistent.
Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com>
---
src/hypervisor/domain_job.h | 4 ++--
src/qemu/qemu_domain.c | 4 ++--
src/qemu/qemu_domainjob.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index c56c22e63c..7d9c715957 100644
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -198,6 +198,6 @@ struct _virDomainObjPrivateJobCallbacks {
virDomainObjPrivateJobAlloc allocJobPrivate;
virDomainObjPrivateJobFree freeJobPrivate;
virDomainObjPrivateJobReset resetJobPrivate;
- virDomainObjPrivateJobFormat formatJob;
- virDomainObjPrivateJobParse parseJob;
+ virDomainObjPrivateJobFormat formatJobPrivate;
+ virDomainObjPrivateJobParse parseJobPrivate;
};
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a643dd03af..2d7f6d761d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -364,8 +364,8 @@ static virDomainObjPrivateJobCallbacks qemuPrivateJobCallbacks = {
.allocJobPrivate = qemuJobAllocPrivate,
.freeJobPrivate = qemuJobFreePrivate,
.resetJobPrivate = qemuJobResetPrivate,
- .formatJob = qemuDomainFormatJobPrivate,
- .parseJob = qemuDomainParseJobPrivate,
+ .formatJobPrivate = qemuDomainFormatJobPrivate,
+ .parseJobPrivate = qemuDomainParseJobPrivate,
};
/**
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 05480239b1..b4082a12e3 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -1294,7 +1294,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
}
if (priv->job.cb &&
- priv->job.cb->formatJob(&childBuf, &priv->job, vm) < 0)
+ priv->job.cb->formatJobPrivate(&childBuf, &priv->job, vm) <
0)
return -1;
virXMLFormatElement(buf, "job", &attrBuf, &childBuf);
@@ -1362,7 +1362,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm,
}
if (priv->job.cb &&
- priv->job.cb->parseJob(ctxt, job, vm) < 0)
+ priv->job.cb->parseJobPrivate(ctxt, job, vm) < 0)
return -1;
return 0;
--
2.35.3