diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py index 920f4fa184..a9ba299cd0 100644 --- a/tools/python/xen/xend/XendClient.py +++ b/tools/python/xen/xend/XendClient.py @@ -196,8 +196,9 @@ class Xend: def xend_domains(self): return self.xendGet(self.domainurl()) - def xend_list_domains(self): - return self.xendGet(self.domainurl(), {'detail': '1'}) + def xend_list_domains(self, detail = True): + return self.xendGet(self.domainurl(), + {'detail': detail and '1' or '0'}) def xend_domain_vcpuinfo(self, dom): return self.xendGet(self.domainurl(dom), {'op': 'vcpuinfo'}) diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 23d1beeb8b..7eaf798ec8 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -396,10 +396,8 @@ def xm_vcpu_list(args): if args: dominfo = map(server.xend_domain_vcpuinfo, args) else: - doms = server.xend_list_domains() - dominfo = map( - lambda x: server.xend_domain_vcpuinfo(sxp.child_value(x, 'name')), - doms) + doms = server.xend_list_domains(False) + dominfo = map(server.xend_domain_vcpuinfo, doms) print 'Name ID VCPU CPU State Time(s) CPU Affinity'