Disable CPU pinning on migration with cpu_mask=all (#1261)

[ganeti-github.git] / lib / hypervisor / hv_kvm / __init__.py

diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
index 0f23962..3569a20 100644 (file)
--- a/lib/hypervisor/hv_kvm/__init__.py
+++ b/lib/hypervisor/hv_kvm/__init__.py
@@ -1900,7 +1900,8 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     # during instance startup anyway, and to avoid problems when soft
     # rebooting the instance.
     cpu_pinning = False
     # during instance startup anyway, and to avoid problems when soft
     # rebooting the instance.
     cpu_pinning = False

-    if up_hvp.get(constants.HV_CPU_MASK, None):
+    if up_hvp.get(constants.HV_CPU_MASK, None) \
+        and up_hvp[constants.HV_CPU_MASK] != constants.CPU_PINNING_ALL:

       cpu_pinning = True
 
     if security_model == constants.HT_SM_POOL:
       cpu_pinning = True
 
     if security_model == constants.HT_SM_POOL: