qemu: Ignore def->cpumask if emulatorpin is specified

If the vcpu placement is "static", it's just fine to ignore the
def->cpumask if emulatorpin is specified.

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f8a2bfdebda113691fde2e54b1d3364cf0306509..ea25d8dab602fbe00d7f072785785871fa7c4d66 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2618,7 +2618,8 @@ static int qemuProcessHook(void *data)
 
     /* This must be done after cgroup placement to avoid resetting CPU
      * affinity */
-    if (qemuProcessInitCpuAffinity(h->driver, h->vm, h->nodemask) < 0)
+    if (!h->vm->def->cputune.emulatorpin &&
+        qemuProcessInitCpuAffinity(h->driver, h->vm, h->nodemask) < 0)
         goto cleanup;
 
     if (qemuProcessInitNumaMemoryPolicy(h->vm, h->nodemask) < 0)