diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libxc/xc_private.c | 20 | ||||
| -rw-r--r-- | tools/libxc/xg_save_restore.h | 6 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 8 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendNode.py | 2 |
4 files changed, 23 insertions, 13 deletions
diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index e5a9c566d5..b48917ed06 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -402,11 +402,21 @@ int xc_version(int xc_handle, int cmd, void *arg) 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 --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h index ca5e51d8d4..7c34fc4658 100644 --- a/tools/libxc/xg_save_restore.h +++ b/tools/libxc/xg_save_restore.h @@ -61,20 +61,20 @@ static int get_platform_info(int xc_handle, uint32_t dom, { 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 --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index e2585dc5ed..3283ca74e5 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/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, diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py index a1275dc47f..fc0accd7d1 100644 --- a/tools/python/xen/xend/XendNode.py +++ b/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']], |