ch: Use CH_DOMAIN_PRIVATE() more

There are two instances where vm->privateData is typecasted only
so that it can be dereferenced further. Well, that's exactly what
CH_DOMAIN_PRIVATE() macro is for. Use that instead.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/ch/ch_events.c b/src/ch/ch_events.c
index f1dc5c6f4ce17bdd9794ce2aa48a116096274f5a..9cb873d8cdce0b4182f0913f2e01f848eacd6b7e 100644 (file)
--- a/src/ch/ch_events.c
+++ b/src/ch/ch_events.c
@@ -54,7 +54,7 @@ static int
 virCHEventStopProcess(virDomainObj *vm,
                       virDomainShutoffReason reason)
 {
-    virCHDriver *driver =  ((virCHDomainObjPrivate *)vm->privateData)->driver;
+    virCHDriver *driver = CH_DOMAIN_PRIVATE(vm)->driver;
 
     virObjectLock(vm);
     if (virDomainObjBeginJob(vm, VIR_JOB_DESTROY))

diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c
index e8d482da978e86970ef5f1dacc544ebc7cadd7b9..6a59bf756acc1f976b647737250dae31b9c4c3f9 100644 (file)
--- a/src/ch/ch_process.c
+++ b/src/ch/ch_process.c
@@ -430,8 +430,8 @@ virCHProcessSetupVcpus(virDomainObj *vm)
     size_t i;
 
     if ((vm->def->cputune.period || vm->def->cputune.quota) &&
-        !virCgroupHasController(((virCHDomainObjPrivate *) vm->privateData)->
-                                cgroup, VIR_CGROUP_CONTROLLER_CPU)) {
+        !virCgroupHasController(CH_DOMAIN_PRIVATE(vm)->cgroup,
+                                VIR_CGROUP_CONTROLLER_CPU)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("cgroup cpu is required for scheduler tuning"));
         return -1;