From: Osier Yang <jyang@redhat.com>
Date: Fri, 12 Oct 2012 09:50:49 +0000 (+0800)
Subject: qemu: Ignore def->cpumask if emulatorpin is specified
X-Git-Tag: v1.0.0-rc1~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3635b41e155ba81bfb8fb259ec7379502237b4b7;p=thirdparty%2Flibvirt.git

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 f8a2bfdebd..ea25d8dab6 100644
--- 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)