bitkeeper revision 1.1389.15.14 (428242a6WycHvjFblUGQbKtJd94NPg)

Many files:
  Merge interface changes from previous 'Split out context fetching into
  separate DOM0 op' and 'xen,tools: pincpu use vcpu and cpumap_t' checkins.
xc_linux_save.c:
  Undo incorrect change from previous patch.
xc.h, xc_domain.c:
  Cleanup whitespace.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

tools/python/xen/lowlevel/xc/xc.c

@@ -205,10 +205,9 @@ static PyObject *pyxc_domain_getinfo(PyObject *self,
                             Py_BuildValue("i", info[i].cpumap[j]));
         }
                  
-        info_dict = Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i"
+        info_dict = Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i"
                                   ",s:l,s:L,s:l,s:i}",
                                   "dom",       info[i].domid,
-                                  "cpu",       info[i].cpu,
                                   "vcpus",     info[i].vcpus,
                                   "dying",     info[i].dying,
                                   "crashed",   info[i].crashed,

tools/python/xen/xend/XendDomainInfo.py

@@ -370,7 +370,7 @@ class XendDomainInfo:
             if self.info['shutdown']:
                 reason = shutdown_reason(self.info['shutdown_reason'])
                 sxpr.append(['shutdown_reason', reason])
-            sxpr.append(['cpu', self.info['cpu']])
+            sxpr.append(['cpu', self.info['vcpu_to_cpu'][0]])
             sxpr.append(['cpu_time', self.info['cpu_time']/1e9])    
             sxpr.append(['vcpus', self.info['vcpus']])
             sxpr.append(['cpumap', self.info['cpumap']])