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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index 7568c6407f15754eec53b0ac4d7f40a4c7fd9416..9c203189a66aefb839f22bec3576bfd891b71eaa 100644 (file)
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -201,6 +201,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 a643dd03afd2f52a4f01af275d716372bb95d24d..2d7f6d761db1a306036e924d8d70e59afd762c70 100644 (file)
--- 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 60318c9e0c18c750683d54f8f85c0ee0cbf2a961..82189393a2c305afdd8813315a0335eb53145122 100644 (file)
--- 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;