提交 47174130 编写于 作者: P Peter Krempa

qemu: vcpupin: Don't overwrite errors from functions setting pinning

Both errors from the cgroups code and from the affinity code would be
overwritten by the API. Report the more specific error.
上级 9268b9ad
...@@ -5066,20 +5066,12 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, ...@@ -5066,20 +5066,12 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu, if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu,
false, &cgroup_vcpu) < 0) false, &cgroup_vcpu) < 0)
goto endjob; goto endjob;
if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, pcpumap) < 0) { if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, pcpumap) < 0)
virReportError(VIR_ERR_OPERATION_INVALID,
_("failed to set cpuset.cpus in cgroup"
" for vcpu %d"), vcpu);
goto endjob; goto endjob;
}
} else { } else {
if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu), if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu),
pcpumap) < 0) { pcpumap) < 0)
virReportError(VIR_ERR_SYSTEM_ERROR,
_("failed to set cpu affinity for vcpu %d"),
vcpu);
goto endjob; goto endjob;
}
} }
virBitmapFree(vcpuinfolive->cpumask); virBitmapFree(vcpuinfolive->cpumask);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册