From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 23 Apr 2015 14:16:03 +0000 (+0200)
Subject: qemu: cgroup: Fix priorities when setting emulatorpin
X-Git-Tag: v1.2.15-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a35b2e5999ff7c892fc1ee86fe9f222175c1727;p=thirdparty%2Flibvirt.git

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 e83342d246..bf0621f7f5 100644
--- 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;