From: Pavel Hrdina Date: Thu, 7 Nov 2019 21:23:04 +0000 (+0100) Subject: qemu_process: fix starting VMs if machine group has limited cpuset.cpus X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4c0398b5284d14c55eca51095673b6fadbbd85fb;p=libvirt.git qemu_process: fix starting VMs if machine group has limited cpuset.cpus Commit reworked process affinity setting but did not take cgroups into account which introduced an issue when starting VM with custom cpuset.cpus for the whole machine group. If the machine group is limited to some pCPUs libvirt should not try to set a VM to run on all pCPUs as it will result in permission denied when writing to cpuset.cpus. To fix this the affinity has to be set separately from cgroups cpuset. Resolves: Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 246934c634..90ebdb43a0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2622,6 +2622,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; virBitmapPtr use_cpumask = NULL; + virBitmapPtr afinity_cpumask = NULL; g_autoptr(virBitmap) hostcpumap = NULL; char *mem_mask = NULL; int ret = -1; @@ -2647,7 +2648,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, * its config file */ if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0) goto cleanup; - use_cpumask = hostcpumap; + afinity_cpumask = hostcpumap; } /* @@ -2688,8 +2689,11 @@ qemuProcessSetupPid(virDomainObjPtr vm, } + if (!afinity_cpumask) + afinity_cpumask = use_cpumask; + /* Setup legacy affinity. */ - if (use_cpumask && virProcessSetAffinity(pid, use_cpumask) < 0) + if (afinity_cpumask && virProcessSetAffinity(pid, afinity_cpumask) < 0) goto cleanup; /* Set scheduler type and priority, but not for the main thread. */