External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu_cgroup: Remove unnecessary virQEMUDriverPtr arguments

Browse Source 
Since commit 2e6ecba1bcac, the pointer to the qemu driver is saved in
domain object's private data and hence does not have to be passed as
yet another parameter if domain object is already one of them.

This is a first (example) patch of this kind of clean up, others will
hopefully follow.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2017-07-25 17:49:43 +02:00
parent a54c962286
commit e1bafb0099
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/qemu/qemu_cgroup.c
View File

@ -604,8 +604,7 @@ qemuTeardownChardevCgroup(virDomainObjPtr vm,
static int static int
qemuSetupDevicesCgroup(virQEMUDriverPtr driver, qemuSetupDevicesCgroup(virDomainObjPtr vm)
virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
@ -644,7 +643,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
if (rv < 0) if (rv < 0)
goto cleanup; goto cleanup;
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(priv->driver);
deviceACL = cfg->cgroupDeviceACL ? deviceACL = cfg->cgroupDeviceACL ?
(const char *const *)cfg->cgroupDeviceACL : (const char *const *)cfg->cgroupDeviceACL :
defaultDeviceACL; defaultDeviceACL;
@ -769,8 +768,7 @@ qemuSetupCpusetCgroup(virDomainObjPtr vm)
static int static int
qemuSetupCpuCgroup(virQEMUDriverPtr driver, qemuSetupCpuCgroup(virDomainObjPtr vm)
virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
@ -806,7 +804,7 @@ qemuSetupCpuCgroup(virQEMUDriverPtr driver,
event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams);
} }
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(priv->driver, event);
} }
return 0; return 0;
@ -814,16 +812,15 @@ qemuSetupCpuCgroup(virQEMUDriverPtr driver,
static int static int
qemuInitCgroup(virQEMUDriverPtr driver, qemuInitCgroup(virDomainObjPtr vm,
virDomainObjPtr vm,
size_t nnicindexes, size_t nnicindexes,
int *nicindexes) int *nicindexes)
{ {
int ret = -1; int ret = -1;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver);
if (!virQEMUDriverIsPrivileged(driver)) if (!virQEMUDriverIsPrivileged(priv->driver))
goto done; goto done;
if (!virCgroupAvailable()) if (!virCgroupAvailable())
@ -954,14 +951,13 @@ qemuRestoreCgroupState(virDomainObjPtr vm)
} }
int int
qemuConnectCgroup(virQEMUDriverPtr driver, qemuConnectCgroup(virDomainObjPtr vm)
virDomainObjPtr vm)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver);
int ret = -1; int ret = -1;
if (!virQEMUDriverIsPrivileged(driver)) if (!virQEMUDriverIsPrivileged(priv->driver))
goto done; goto done;
if (!virCgroupAvailable()) if (!virCgroupAvailable())
@ -991,8 +987,7 @@ qemuConnectCgroup(virQEMUDriverPtr driver,
} }
int int
qemuSetupCgroup(virQEMUDriverPtr driver, qemuSetupCgroup(virDomainObjPtr vm,
virDomainObjPtr vm,
size_t nnicindexes, size_t nnicindexes,
int *nicindexes) int *nicindexes)
{ {
@ -1005,13 +1000,13 @@ qemuSetupCgroup(virQEMUDriverPtr driver,
return -1; return -1;
} }
if (qemuInitCgroup(driver, vm, nnicindexes, nicindexes) < 0) if (qemuInitCgroup(vm, nnicindexes, nicindexes) < 0)
return -1; return -1;
if (!priv->cgroup) if (!priv->cgroup)
return 0; return 0;
if (qemuSetupDevicesCgroup(driver, vm) < 0) if (qemuSetupDevicesCgroup(vm) < 0)
goto cleanup; goto cleanup;
if (qemuSetupBlkioCgroup(vm) < 0) if (qemuSetupBlkioCgroup(vm) < 0)
@ -1020,7 +1015,7 @@ qemuSetupCgroup(virQEMUDriverPtr driver,
if (qemuSetupMemoryCgroup(vm) < 0) if (qemuSetupMemoryCgroup(vm) < 0)
goto cleanup; goto cleanup;
if (qemuSetupCpuCgroup(driver, vm) < 0) if (qemuSetupCpuCgroup(vm) < 0)
goto cleanup; goto cleanup;
if (qemuSetupCpusetCgroup(vm) < 0) if (qemuSetupCpusetCgroup(vm) < 0)

6
src/qemu/qemu_cgroup.h
View File

@ -55,10 +55,8 @@ int qemuSetupChardevCgroup(virDomainObjPtr vm,
virDomainChrDefPtr dev); virDomainChrDefPtr dev);
int qemuTeardownChardevCgroup(virDomainObjPtr vm, int qemuTeardownChardevCgroup(virDomainObjPtr vm,
virDomainChrDefPtr dev); virDomainChrDefPtr dev);
int qemuConnectCgroup(virQEMUDriverPtr driver, int qemuConnectCgroup(virDomainObjPtr vm);
virDomainObjPtr vm); int qemuSetupCgroup(virDomainObjPtr vm,
int qemuSetupCgroup(virQEMUDriverPtr driver,
virDomainObjPtr vm,
size_t nnicindexes, size_t nnicindexes,
int *nicindexes); int *nicindexes);
int qemuSetupCpusetMems(virDomainObjPtr vm); int qemuSetupCpusetMems(virDomainObjPtr vm);

4
src/qemu/qemu_process.c
View File

@ -5594,7 +5594,7 @@ qemuProcessLaunch(virConnectPtr conn,
} }
VIR_DEBUG("Setting up domain cgroup (if required)"); VIR_DEBUG("Setting up domain cgroup (if required)");
if (qemuSetupCgroup(driver, vm, nnicindexes, nicindexes) < 0) if (qemuSetupCgroup(vm, nnicindexes, nicindexes) < 0)
goto cleanup; goto cleanup;
if (!(priv->perf = virPerfNew())) if (!(priv->perf = virPerfNew()))
@ -6819,7 +6819,7 @@ qemuProcessReconnect(void *opaque)
if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0)
goto error; goto error;
if (qemuConnectCgroup(driver, obj) < 0) if (qemuConnectCgroup(obj) < 0)
goto error; goto error;
if (qemuDomainPerfRestart(obj) < 0) if (qemuDomainPerfRestart(obj) < 0)