qemu: cgroup: Fix priorities when setting emulatorpin

Use the custom emulator pin setting with the highest priority same as
with vcpupin.

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index e83342d2467b41f0c6de413621a2a7aac2b41d2f..bf0621f7f56abb9201504e669eb1b592a243e307 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -1110,10 +1110,10 @@ qemuSetupCgroupForEmulator(virDomainObjPtr vm)
     if (virCgroupMoveTask(priv->cgroup, cgroup_emulator) < 0)
         goto cleanup;
 
-    if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO)
-        cpumask = priv->autoCpuset;
-    else if (def->cputune.emulatorpin)
+    if (def->cputune.emulatorpin)
         cpumask = def->cputune.emulatorpin->cpumask;
+    else if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO)
+        cpumask = priv->autoCpuset;
     else if (def->cpumask)
         cpumask = def->cpumask;