From: Michal Privoznik Date: Wed, 2 Apr 2025 15:45:23 +0000 (+0200) Subject: ch: Use CH_DOMAIN_PRIVATE() more X-Git-Tag: v11.3.0-rc1~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dae81c8d718ccd6a75f0e76380186ed0877d786;p=thirdparty%2Flibvirt.git 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 Reviewed-by: Ján Tomko --- diff --git a/src/ch/ch_events.c b/src/ch/ch_events.c index f1dc5c6f4c..9cb873d8cd 100644 --- 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 e8d482da97..6a59bf756a 100644 --- 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;