Merged.

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

@@ -721,7 +721,7 @@ static PyObject *pyxc_xeninfo(PyObject *self,
     xen_compile_info_t xen_cc;
     xen_changeset_info_t xen_chgset;
     xen_capabilities_info_t xen_caps;
-    xen_parameters_info_t xen_parms;
+    xen_platform_parameters_t p_parms;
     long xen_version;
     char str[128];
 
@@ -739,17 +739,17 @@ static PyObject *pyxc_xeninfo(PyObject *self,
     if ( xc_version(xc->xc_handle, XENVER_capabilities, &xen_caps) != 0 )
         return PyErr_SetFromErrno(xc_error);
 
-    if ( xc_version(xc->xc_handle, XENVER_parameters, &xen_parms) != 0 )
+    if ( xc_version(xc->xc_handle, XENVER_platform_parameters, &p_parms) != 0 )
         return PyErr_SetFromErrno(xc_error);
 
-    sprintf(str,"virt_start=0x%lx",xen_parms.virt_start);
+    sprintf(str, "virt_start=0x%lx", p_parms.virt_start);
 
     return Py_BuildValue("{s:i,s:i,s:s,s:s,s:s,s:s,s:s,s:s,s:s,s:s}",
                          "xen_major", xen_version >> 16,
                          "xen_minor", (xen_version & 0xffff),
                          "xen_extra", xen_extra,
                          "xen_caps",  xen_caps,
-                         "xen_params", str,
+                         "platform_params", str,
                          "xen_changeset", xen_chgset,
                          "cc_compiler", xen_cc.compiler,
                          "cc_compile_by", xen_cc.compile_by,

tools/python/xen/xend/XendNode.py

@@ -75,7 +75,7 @@ class XendNode:
                 ['xen_minor', xinfo['xen_minor']],
                 ['xen_extra', xinfo['xen_extra']],
                 ['xen_caps',  xinfo['xen_caps']],
-                ['xen_params',xinfo['xen_params']],
+                ['platform_params',xinfo['platform_params']],
                 ['xen_changeset', xinfo['xen_changeset']],
                 ['cc_compiler', xinfo['cc_compiler']],
                 ['cc_compile_by', xinfo['cc_compile_by']],

tools/python/xen/xm/shutdown.py

@@ -22,9 +22,9 @@ import sys
 import time
 
 from xen.xend.XendClient import server
+from xen.xend import sxp
 from xen.xm.opts import *
 
-DOM0_NAME = 'Domain-0'
 DOM0_ID = '0'
 
 gopts = Opts(use="""[options] [DOM]
@@ -54,7 +54,8 @@ gopts.opt('reboot', short='R',
 
 def shutdown(opts, doms, mode, wait):
     if doms == None: doms = server.xend_domains()
-    for x in [DOM0_NAME, DOM0_ID]:
+    dom0_name = sxp.child_value(server.xend_domain(0), 'name')
+    for x in [dom0_name, DOM0_ID]:
         if x in doms:
             doms.remove(x)
     for d in doms: