提交 b8286f06 编写于 作者: J Ján Tomko

Simplify qemuSetupChrSourceCgroup and its callers

The domain definition is not needed in any of these functions.
Only pass it to qemuSetupChardevCgroup, which is used as a callback
for virDomainChrDefForeach.

Use the right type for passing virDomainObjPtr instead of
void* where possible.
上级 b57ce788
...@@ -149,11 +149,9 @@ qemuTeardownDiskCgroup(virDomainObjPtr vm, ...@@ -149,11 +149,9 @@ qemuTeardownDiskCgroup(virDomainObjPtr vm,
static int static int
qemuSetupChrSourceCgroup(virDomainDefPtr def ATTRIBUTE_UNUSED, qemuSetupChrSourceCgroup(virDomainObjPtr vm,
virDomainChrSourceDefPtr dev, virDomainChrSourceDefPtr dev)
void *opaque)
{ {
virDomainObjPtr vm = opaque;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int ret; int ret;
...@@ -171,25 +169,25 @@ qemuSetupChrSourceCgroup(virDomainDefPtr def ATTRIBUTE_UNUSED, ...@@ -171,25 +169,25 @@ qemuSetupChrSourceCgroup(virDomainDefPtr def ATTRIBUTE_UNUSED,
} }
static int static int
qemuSetupChardevCgroup(virDomainDefPtr def, qemuSetupChardevCgroup(virDomainDefPtr def ATTRIBUTE_UNUSED,
virDomainChrDefPtr dev, virDomainChrDefPtr dev,
void *opaque) void *opaque)
{ {
return qemuSetupChrSourceCgroup(def, &dev->source, opaque); virDomainObjPtr vm = opaque;
return qemuSetupChrSourceCgroup(vm, &dev->source);
} }
static int static int
qemuSetupTPMCgroup(virDomainDefPtr def, qemuSetupTPMCgroup(virDomainObjPtr vm)
virDomainTPMDefPtr dev,
void *opaque)
{ {
int ret = 0; int ret = 0;
virDomainTPMDefPtr dev = vm->def->tpm;
switch (dev->type) { switch (dev->type) {
case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
ret = qemuSetupChrSourceCgroup(def, &dev->data.passthrough.source, ret = qemuSetupChrSourceCgroup(vm, &dev->data.passthrough.source);
opaque);
break; break;
case VIR_DOMAIN_TPM_TYPE_LAST: case VIR_DOMAIN_TPM_TYPE_LAST:
break; break;
...@@ -585,10 +583,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, ...@@ -585,10 +583,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
vm) < 0) vm) < 0)
goto cleanup; goto cleanup;
if (vm->def->tpm && if (vm->def->tpm && qemuSetupTPMCgroup(vm) < 0)
(qemuSetupTPMCgroup(vm->def,
vm->def->tpm,
vm) < 0))
goto cleanup; goto cleanup;
for (i = 0; i < vm->def->nhostdevs; i++) { for (i = 0; i < vm->def->nhostdevs; i++) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册