diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 0e94cae9218aefa242653681e622813a2a7da42f..ed5416b4a89ef4e8148ba75b79658f7a5c137a84 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -607,7 +607,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, } -static int +int qemuSetupCpusetMems(virDomainObjPtr vm, virBitmapPtr nodemask) { @@ -866,13 +866,6 @@ qemuSetupCgroup(virQEMUDriverPtr driver, return ret; } -int -qemuSetupCgroupPostInit(virDomainObjPtr vm, - virBitmapPtr nodemask) -{ - return qemuSetupCpusetMems(vm, nodemask); -} - int qemuSetupCgroupVcpuBW(virCgroupPtr cgroup, unsigned long long period, diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 4a4f22c7789b67df3bdfe95f3360509451274ac7..72c28f7f554fba43205633d993f16da9b27c0c95 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -47,8 +47,8 @@ int qemuConnectCgroup(virQEMUDriverPtr driver, int qemuSetupCgroup(virQEMUDriverPtr driver, virDomainObjPtr vm, virBitmapPtr nodemask); -int qemuSetupCgroupPostInit(virDomainObjPtr vm, - virBitmapPtr nodemask); +int qemuSetupCpusetMems(virDomainObjPtr vm, + virBitmapPtr nodemask); int qemuSetupCgroupVcpuBW(virCgroupPtr cgroup, unsigned long long period, long long quota); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a19e71a8f0add7ef78e17d763820ff49d287b461..9781e4416fc86693a1b6513f565d4299ae6c0d7b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4710,7 +4710,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Setting up post-init cgroup restrictions"); - if (qemuSetupCgroupPostInit(vm, nodemask) < 0) + if (qemuSetupCpusetMems(vm, nodemask) < 0) goto cleanup; VIR_DEBUG("Detecting VCPU PIDs");