From 5a35b2e5999ff7c892fc1ee86fe9f222175c1727 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 23 Apr 2015 16:16:03 +0200 Subject: [PATCH] qemu: cgroup: Fix priorities when setting emulatorpin Use the custom emulator pin setting with the highest priority same as with vcpupin. --- src/qemu/qemu_cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e83342d24..bf0621f7f 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; -- 2.39.5