fix bug in qemuSetupCgroupForEmulator

Should not return 0 when failed to setup cgroup.

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 5b4279302f0259ae4579db1c80210a424f9a8a25..71558c3a1b4aa0c5b53fd16c89f9202221c58a45 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -691,13 +691,17 @@ int qemuSetupCgroupForEmulator(struct qemud_driver *driver,
     }
 
     if (def->cputune.emulatorpin &&
-        qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET) &&
-        qemuSetupCgroupEmulatorPin(cgroup_emulator, def->cputune.emulatorpin) < 0)
-        goto cleanup;
+        qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET)) {
+        rc = qemuSetupCgroupEmulatorPin(cgroup_emulator,
+                                        def->cputune.emulatorpin);
+        if (rc < 0)
+            goto cleanup;
+    }
 
     if (period || quota) {
         if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) {
-            if (qemuSetupCgroupVcpuBW(cgroup_emulator, period, quota) < 0)
+            if ((rc = qemuSetupCgroupVcpuBW(cgroup_emulator, period,
+                                            quota)) < 0)
                 goto cleanup;
         }
     }