# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 9b345321fd0676436d399c6eca0afd625b886ca4
# Parent 32b574b24b18f709d3ae53661fd1dbe1ed6ce31f
# Parent 8ed932ab9f2ac7eda18356ed7e2503225b297209
Merged.
diff -r 32b574b24b18 -r 9b345321fd06 tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c Wed Nov 16 14:32:56 2005
+++ b/tools/libxc/xc_private.c Wed Nov 16 14:50:36 2005
@@ -402,11 +402,21 @@
switch ( cmd )
{
- case XENVER_extraversion: argsize = sizeof(xen_extraversion_t); break;
- case XENVER_compile_info: argsize = sizeof(xen_compile_info_t); break;
- case XENVER_capabilities: argsize = sizeof(xen_capabilities_info_t); break;
- case XENVER_changeset: argsize = sizeof(xen_changeset_info_t); break;
- case XENVER_parameters: argsize = sizeof(xen_parameters_info_t); break;
+ case XENVER_extraversion:
+ argsize = sizeof(xen_extraversion_t);
+ break;
+ case XENVER_compile_info:
+ argsize = sizeof(xen_compile_info_t);
+ break;
+ case XENVER_capabilities:
+ argsize = sizeof(xen_capabilities_info_t);
+ break;
+ case XENVER_changeset:
+ argsize = sizeof(xen_changeset_info_t);
+ break;
+ case XENVER_platform_parameters:
+ argsize = sizeof(xen_platform_parameters_t);
+ break;
}
if ( (argsize != 0) && (mlock(arg, argsize) != 0) )
diff -r 32b574b24b18 -r 9b345321fd06 tools/libxc/xg_save_restore.h
--- a/tools/libxc/xg_save_restore.h Wed Nov 16 14:32:56 2005
+++ b/tools/libxc/xg_save_restore.h Wed Nov 16 14:50:36 2005
@@ -61,20 +61,20 @@
{
xen_capabilities_info_t xen_caps = "";
- xen_parameters_info_t xen_parms;
+ xen_platform_parameters_t xen_params;
xc_physinfo_t physinfo;
if (xc_physinfo(xc_handle, &physinfo) != 0)
return 0;
- if (xc_version(xc_handle, XENVER_parameters, &xen_parms) != 0)
+ if (xc_version(xc_handle, XENVER_platform_parameters, &xen_params) != 0)
return 0;
if (xc_version(xc_handle, XENVER_capabilities, &xen_caps) != 0)
return 0;
*max_mfn = physinfo.total_pages;
- *hvirt_start = xen_parms.virt_start;
+ *hvirt_start = xen_params.virt_start;
if (strstr(xen_caps, "xen-3.0-x86_64"))
*pt_levels = 4;
diff -r 32b574b24b18 -r 9b345321fd06 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Wed Nov 16 14:32:56 2005
+++ b/tools/python/xen/lowlevel/xc/xc.c Wed Nov 16 14:50:36 2005
@@ -721,7 +721,7 @@
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 @@
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 )
- return PyErr_SetFromErrno(xc_error);
-
- sprintf(str,"virt_start=0x%lx",xen_parms.virt_start);
+ if ( xc_version(xc->xc_handle, XENVER_platform_parameters, &p_parms) != 0 )
+ return PyErr_SetFromErrno(xc_error);
+
+ 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,
diff -r 32b574b24b18 -r 9b345321fd06 tools/python/xen/xend/XendNode.py
--- a/tools/python/xen/xend/XendNode.py Wed Nov 16 14:32:56 2005
+++ b/tools/python/xen/xend/XendNode.py Wed Nov 16 14:50:36 2005
@@ -75,7 +75,7 @@
['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']],
diff -r 32b574b24b18 -r 9b345321fd06 tools/python/xen/xm/shutdown.py
--- a/tools/python/xen/xm/shutdown.py Wed Nov 16 14:32:56 2005
+++ b/tools/python/xen/xm/shutdown.py Wed Nov 16 14:50:36 2005
@@ -22,9 +22,9 @@
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 @@
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:
diff -r 32b574b24b18 -r 9b345321fd06 xen/common/kernel.c
--- a/xen/common/kernel.c Wed Nov 16 14:32:56 2005
+++ b/xen/common/kernel.c Wed Nov 16 14:50:36 2005
@@ -124,10 +124,12 @@
return 0;
}
- case XENVER_parameters:
+ case XENVER_platform_parameters:
{
- xen_parameters_info_t info = { .virt_start = HYPERVISOR_VIRT_START };
- if ( copy_to_user(arg, &info, sizeof(info)) )
+ xen_platform_parameters_t params = {
+ .virt_start = HYPERVISOR_VIRT_START
+ };
+ if ( copy_to_user(arg, ¶ms, sizeof(params)) )
return -EFAULT;
return 0;
diff -r 32b574b24b18 -r 9b345321fd06 xen/include/public/version.h
--- a/xen/include/public/version.h Wed Nov 16 14:32:56 2005
+++ b/xen/include/public/version.h Wed Nov 16 14:50:36 2005
@@ -34,10 +34,10 @@
#define XENVER_changeset 4
typedef char xen_changeset_info_t[64];
-#define XENVER_parameters 5
-typedef struct xen_parameters_info {
+#define XENVER_platform_parameters 5
+typedef struct xen_platform_parameters {
unsigned long virt_start;
-} xen_parameters_info_t;
+} xen_platform_parameters_t;
#endif /* __XEN_PUBLIC_VERSION_H__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home