diff options
-rw-r--r-- | tools/python/xen/xend/XendAPI.py | 3 | ||||
-rw-r--r-- | tools/python/xen/xend/XendDomain.py | 1 | ||||
-rw-r--r-- | tools/python/xen/xm/main.py | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py index fb39fd87c7..07e6b2100e 100644 --- a/tools/python/xen/xend/XendAPI.py +++ b/tools/python/xen/xend/XendAPI.py @@ -1509,8 +1509,7 @@ class XendAPI(object): if key.startswith("cpumap"): vcpu = int(key[6:]) try: - cpus = map(int, value.split(",")) - xendom.domain_pincpu(xeninfo.getDomid(), vcpu, cpus) + xendom.domain_pincpu(xeninfo.getDomid(), vcpu, value) except Exception, ex: log.exception(ex) diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index b624f786ad..a8ee276df8 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -1442,6 +1442,7 @@ class XendDomain: # set the same cpumask for all vcpus rc = 0 cpus = dominfo.getCpus() + cpumap = map(int, cpumap.split(",")) for v in vcpus: try: if dominfo._stateGet() in (DOM_STATE_RUNNING, DOM_STATE_PAUSED): diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index a7b375dafa..ae3bc5a914 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -1379,7 +1379,7 @@ def xm_vcpu_pin(args): else: cpus.append(int(c)) cpus.sort() - return cpus + return ",".join(map(str, cpus)) dom = args[0] vcpu = args[1] @@ -1389,9 +1389,8 @@ def xm_vcpu_pin(args): cpumap = cpu_make_map(args[2]) if serverType == SERVER_XEN_API: - cpumap = map(str, cpumap) server.xenapi.VM.add_to_VCPUs_params_live( - get_single_vm(dom), "cpumap%i" % int(vcpu), ",".join(cpumap)) + get_single_vm(dom), "cpumap%i" % int(vcpu), cpumap) else: server.xend.domain.pincpu(dom, vcpu, cpumap) |