]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: vcpupin: Don't overwrite errors from functions setting pinning
authorPeter Krempa <pkrempa@redhat.com>
Fri, 12 Feb 2016 05:54:41 +0000 (06:54 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 19 Feb 2016 14:23:54 +0000 (15:23 +0100)
Both errors from the cgroups code and from the affinity code would be
overwritten by the API. Report the more specific error.

src/qemu/qemu_driver.c

index a76252181485c7400036c54e35f06eaf92d22d09..24c1ca4386af7060bc0b19e89d87e34243addd8c 100644 (file)
@@ -5066,20 +5066,12 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
             if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu,
                                    false, &cgroup_vcpu) < 0)
                 goto endjob;
-            if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, pcpumap) < 0) {
-                virReportError(VIR_ERR_OPERATION_INVALID,
-                               _("failed to set cpuset.cpus in cgroup"
-                                 " for vcpu %d"), vcpu);
+            if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, pcpumap) < 0)
                 goto endjob;
-            }
         } else {
             if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu),
-                                      pcpumap) < 0) {
-                virReportError(VIR_ERR_SYSTEM_ERROR,
-                               _("failed to set cpu affinity for vcpu %d"),
-                               vcpu);
+                                      pcpumap) < 0)
                 goto endjob;
-            }
         }
 
         virBitmapFree(vcpuinfolive->cpumask);