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: Cleanup coding style nits in qemu_cgroup.c

Browse Source
This commit is contained in:
Peter Krempa 2013-07-18 11:29:27 +02:00
parent a39f69d2bb
commit bac2182041
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/qemu/qemu_cgroup.c
View File

@ -76,8 +76,9 @@ qemuSetupDiskPathAllow(virDomainDiskDefPtr disk,
} }
int qemuSetupDiskCgroup(virDomainObjPtr vm, int
virDomainDiskDefPtr disk) qemuSetupDiskCgroup(virDomainObjPtr vm,
virDomainDiskDefPtr disk)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@ -85,10 +86,7 @@ int qemuSetupDiskCgroup(virDomainObjPtr vm,
VIR_CGROUP_CONTROLLER_DEVICES)) VIR_CGROUP_CONTROLLER_DEVICES))
return 0; return 0;
return virDomainDiskDefForeachPath(disk, return virDomainDiskDefForeachPath(disk, true, qemuSetupDiskPathAllow, vm);
true,
qemuSetupDiskPathAllow,
vm);
} }
@ -120,8 +118,9 @@ qemuTeardownDiskPathDeny(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED,
} }
int qemuTeardownDiskCgroup(virDomainObjPtr vm, int
virDomainDiskDefPtr disk) qemuTeardownDiskCgroup(virDomainObjPtr vm,
virDomainDiskDefPtr disk)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@ -673,9 +672,7 @@ qemuSetupCpusetCgroup(virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
rc = virCgroupSetCpusetCpus(priv->cgroup, cpu_mask); if ((rc = virCgroupSetCpusetCpus(priv->cgroup, cpu_mask)) != 0) {
if (rc != 0) {
virReportSystemError(-rc, virReportSystemError(-rc,
_("Unable to set cpuset.cpus for domain %s"), _("Unable to set cpuset.cpus for domain %s"),
vm->def->name); vm->def->name);
@ -721,9 +718,10 @@ qemuSetupCpuCgroup(virDomainObjPtr vm)
} }
int qemuInitCgroup(virQEMUDriverPtr driver, int
virDomainObjPtr vm, qemuInitCgroup(virQEMUDriverPtr driver,
bool startup) virDomainObjPtr vm,
bool startup)
{ {
int rc = -1; int rc = -1;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@ -828,9 +826,10 @@ cleanup:
} }
int qemuSetupCgroup(virQEMUDriverPtr driver, int
virDomainObjPtr vm, qemuSetupCgroup(virQEMUDriverPtr driver,
virBitmapPtr nodemask) virDomainObjPtr vm,
virBitmapPtr nodemask)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
@ -866,8 +865,10 @@ cleanup:
return ret; return ret;
} }
int qemuSetupCgroupVcpuBW(virCgroupPtr cgroup, unsigned long long period, int
long long quota) qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
unsigned long long period,
long long quota)
{ {
int rc; int rc;
unsigned long long old_period; unsigned long long old_period;
@ -914,10 +915,11 @@ cleanup:
return -1; return -1;
} }
int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup, int
virDomainVcpuPinDefPtr *vcpupin, qemuSetupCgroupVcpuPin(virCgroupPtr cgroup,
int nvcpupin, virDomainVcpuPinDefPtr *vcpupin,
int vcpuid) int nvcpupin,
int vcpuid)
{ {
size_t i; size_t i;
@ -930,8 +932,9 @@ int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup,
return -1; return -1;
} }
int qemuSetupCgroupEmulatorPin(virCgroupPtr cgroup, int
virBitmapPtr cpumask) qemuSetupCgroupEmulatorPin(virCgroupPtr cgroup,
virBitmapPtr cpumask)
{ {
int rc = 0; int rc = 0;
char *new_cpus = NULL; char *new_cpus = NULL;
@ -957,7 +960,8 @@ cleanup:
return rc; return rc;
} }
int qemuSetupCgroupForVcpu(virDomainObjPtr vm) int
qemuSetupCgroupForVcpu(virDomainObjPtr vm)
{ {
virCgroupPtr cgroup_vcpu = NULL; virCgroupPtr cgroup_vcpu = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@ -1045,9 +1049,10 @@ cleanup:
return -1; return -1;
} }
int qemuSetupCgroupForEmulator(virQEMUDriverPtr driver, int
virDomainObjPtr vm, qemuSetupCgroupForEmulator(virQEMUDriverPtr driver,
virBitmapPtr nodemask) virDomainObjPtr vm,
virBitmapPtr nodemask)
{ {
virBitmapPtr cpumask = NULL; virBitmapPtr cpumask = NULL;
virBitmapPtr cpumap = NULL; virBitmapPtr cpumap = NULL;
@ -1127,7 +1132,8 @@ cleanup:
return rc; return rc;
} }
int qemuRemoveCgroup(virDomainObjPtr vm) int
qemuRemoveCgroup(virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@ -1137,7 +1143,8 @@ int qemuRemoveCgroup(virDomainObjPtr vm)
return virCgroupRemove(priv->cgroup); return virCgroupRemove(priv->cgroup);
} }
int qemuAddToCgroup(virDomainObjPtr vm) int
qemuAddToCgroup(virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int rc; int rc;